From 95784e5c7d80af490a546f8865456e11b4ea8586 Mon Sep 17 00:00:00 2001
From: Charles7c <charles7c@126.com>
Date: Sun, 5 Mar 2023 13:10:28 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E4=B8=8D=E5=86=8D?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=88=B6=20ID=20=E4=B8=BA=200=20=E7=9A=84?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95=E7=9A=84=E7=88=B6=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../top/charles7c/cnadmin/common/constant/SysConsts.java     | 5 +++++
 .../charles7c/cnadmin/common/util/validate/CheckUtils.java   | 5 ++++-
 .../cnadmin/system/service/impl/DeptServiceImpl.java         | 5 +++++
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/constant/SysConsts.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/constant/SysConsts.java
index 19b4011d..d18ab62d 100644
--- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/constant/SysConsts.java
+++ b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/constant/SysConsts.java
@@ -38,6 +38,11 @@ public class SysConsts {
      */
     public static final String ALL_PERMISSION = "*";
 
+    /**
+     * 顶级父 ID
+     */
+    public static final Long SUPER_PARENT_ID = 0L;
+
     /**
      * 默认密码
      */
diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/validate/CheckUtils.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/validate/CheckUtils.java
index 791d40d6..0c3a6468 100644
--- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/validate/CheckUtils.java
+++ b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/validate/CheckUtils.java
@@ -20,6 +20,8 @@ import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
+import cn.hutool.core.util.StrUtil;
+
 import top.charles7c.cnadmin.common.exception.ServiceException;
 
 /**
@@ -60,7 +62,8 @@ public class CheckUtils extends Validator {
      *            字段值
      */
     public static void throwIfNull(Object obj, String entityName, String fieldName, Object fieldValue) {
-        String message = String.format("%s 为 [%s] 的 %s 记录已不存在", fieldName, fieldValue, entityName);
+        String message =
+            String.format("%s 为 [%s] 的 %s 记录已不存在", fieldName, fieldValue, StrUtil.replace(entityName, "DO", ""));
         throwIfNull(obj, message, EXCEPTION_TYPE);
     }
 
diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/DeptServiceImpl.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/DeptServiceImpl.java
index 139142fa..b68db2b9 100644
--- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/DeptServiceImpl.java
+++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/DeptServiceImpl.java
@@ -17,6 +17,7 @@
 package top.charles7c.cnadmin.system.service.impl;
 
 import java.util.List;
+import java.util.Objects;
 
 import javax.annotation.Resource;
 
@@ -26,6 +27,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import top.charles7c.cnadmin.common.base.BaseServiceImpl;
+import top.charles7c.cnadmin.common.constant.SysConsts;
 import top.charles7c.cnadmin.common.enums.DisEnableStatusEnum;
 import top.charles7c.cnadmin.common.util.ExceptionUtils;
 import top.charles7c.cnadmin.common.util.validate.CheckUtils;
@@ -86,6 +88,9 @@ public class DeptServiceImpl extends BaseServiceImpl<DeptMapper, DeptDO, DeptVO,
         super.fillDetail(detailObj);
         if (detailObj instanceof DeptDetailVO) {
             DeptDetailVO detailVO = (DeptDetailVO)detailObj;
+            if (Objects.equals(SysConsts.SUPER_PARENT_ID, detailVO.getParentId())) {
+                return;
+            }
             detailVO.setParentName(ExceptionUtils.exToNull(() -> this.get(detailVO.getParentId()).getDeptName()));
         }
     }