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 this.get(detailVO.getParentId()).getDeptName())); } }