From 3107f6f4a90b5f5b7c6ff95ec2ae2296a2e307f6 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Sun, 28 Apr 2024 12:34:46 +0800
Subject: [PATCH] 机构删除异常调整

---
 src/main/java/org/springblade/modules/system/service/impl/DeptServiceImpl.java |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/src/main/java/org/springblade/modules/system/service/impl/DeptServiceImpl.java b/src/main/java/org/springblade/modules/system/service/impl/DeptServiceImpl.java
index 945d82e..a552d81 100644
--- a/src/main/java/org/springblade/modules/system/service/impl/DeptServiceImpl.java
+++ b/src/main/java/org/springblade/modules/system/service/impl/DeptServiceImpl.java
@@ -20,6 +20,7 @@
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.apache.logging.log4j.util.Strings;
 import org.springblade.common.cache.SysCache;
 import org.springblade.common.utils.AuthUtils;
 import org.springblade.common.utils.NodeTreeUtil;
@@ -188,7 +189,7 @@
 			// 查询当前机构信息
 			DeptVO dept = baseMapper.getDeptById(id);
 			// 如果父机构为物业公司
-			if (dept.getParentName().equals("物业公司")) {
+			if (!Strings.isBlank(dept.getParentName()) && dept.getParentName().equals("物业公司")) {
 				// 删除
 				propertyCompanyService.remove(Wrappers.<PropertyCompanyEntity>update().lambda().eq(PropertyCompanyEntity::getDeptId, id));
 			}

--
Gitblit v1.9.3