删除校验

eco-nexus-core/nexus-core-biz/src/main/java/org/eco/vip/nexus/core/controller/dict/DictController.java

@@ -87,6 +87,9 @@ public class DictController {
     @DeleteMapping("/delete")
     @SaCheckPermission("system:dict:delete")
     public CommonResult<String> delete(@RequestBody @Valid @NotEmpty(message = "集合不能为空") List<String> ids) {
+        if(dictService.hasChildByIds(ids)) {
+            return fail("存在子节点，无法删除！");
+        }
         boolean result = dictService.delete(ids);
         if (!result) {
             return fail("删除失败！");

eco-nexus-core/nexus-core-biz/src/main/java/org/eco/vip/nexus/core/controller/org/OrgController.java

@@ -80,6 +80,9 @@ public class OrgController {
     @DeleteMapping("/delete")
     @SaCheckPermission("system:org:delete")
     public CommonResult<String> delete(@RequestBody @Valid @NotEmpty(message = "集合不能为空") List<String> orgIds) {
+        if(orgService.hasChildByIds(orgIds)) {
+            return fail("存在下级组织，不允许删除");
+        }
         boolean result = orgService.delete(orgIds);
         if (!result) {
             return fail("删除组织失败！");

eco-nexus-core/nexus-core-biz/src/main/java/org/eco/vip/nexus/core/domain/dict/Dict.java

@@ -53,6 +53,11 @@ public class Dict extends BaseEntity {
      */
     private String callbackShowStyle;
 
+    /**
+     * 是否锁定数据1锁定0不锁定
+     */
+    private String isLock;
+
     /**
      * 顺序
      */

eco-nexus-core/nexus-core-biz/src/main/java/org/eco/vip/nexus/core/domain/dict/pojo/DictBO.java

@@ -57,6 +57,11 @@ public class DictBO extends BaseBO {
      */
     private String callbackShowStyle;
 
+    /**
+     * 是否锁定数据1锁定0不锁定
+     */
+    private String isLock;
+
     /**
      * 顺序
      */

eco-nexus-core/nexus-core-biz/src/main/java/org/eco/vip/nexus/core/domain/dict/pojo/DictVO.java

@@ -53,6 +53,11 @@ public class DictVO extends BaseEntity {
      */
     private String callbackShowStyle;
 
+    /**
+     * 是否锁定数据1锁定0不锁定
+     */
+    private String isLock;
+
     /**
      * 顺序
      */

eco-nexus-core/nexus-core-biz/src/main/java/org/eco/vip/nexus/core/service/dict/DictService.java

@@ -20,6 +20,7 @@ import org.eco.vip.orm.domain.PageQuery;
 import org.eco.vip.orm.exception.BusinessException;
 import org.eco.vip.orm.pojo.PageResult;
 import org.eco.vip.orm.service.BaseService;
+import org.eco.vip.orm.utils.CollUtils;
 import org.eco.vip.orm.utils.JsonUtils;
 import org.eco.vip.orm.utils.MapstructUtils;
 import org.eco.vip.orm.utils.ObjUtils;
@@ -136,4 +137,11 @@ public class DictService extends BaseService<DictMapper, Dict> implements IDictS
         QueryWrapper queryWrapper = query().where(DICT.DICT_ID.eq(id));
         return this.getOneAs(queryWrapper, DictVO.class);
     }
+
+    @Override
+    public boolean hasChildByIds(List<String> ids) {
+        QueryWrapper queryWrapper = query().where(DICT.PARENT_ID.in(ids));
+        List<Dict> dictList =  this.list(queryWrapper);
+        return CollUtils.isNotEmpty(dictList);
+    }
 }

eco-nexus-core/nexus-core-biz/src/main/java/org/eco/vip/nexus/core/service/dict/IDictService.java

@@ -78,4 +78,12 @@ public interface IDictService extends IBaseService<Dict> {
      * @return 字典信息
      */
     DictVO selectById(String id);
+
+    /**
+     * 是否存在子节点
+     *
+     * @param ids ids
+     * @return 结果
+     */
+    boolean hasChildByIds(List<String> ids);
 }

eco-nexus-core/nexus-core-biz/src/main/java/org/eco/vip/nexus/core/service/org/IOrgService.java

@@ -85,6 +85,6 @@ public interface IOrgService extends IBaseService<Org> {
      * @param ids 组织ID
      * @return 结果
      */
-    boolean hasChildByDeptId(List<String> ids);
+    boolean hasChildByIds(List<String> ids);
 
 }

eco-nexus-core/nexus-core-biz/src/main/java/org/eco/vip/nexus/core/service/org/OrgService.java

@@ -20,6 +20,7 @@ import org.eco.vip.orm.domain.PageQuery;
 import org.eco.vip.orm.exception.BusinessException;
 import org.eco.vip.orm.pojo.PageResult;
 import org.eco.vip.orm.service.BaseService;
+import org.eco.vip.orm.utils.CollUtils;
 import org.eco.vip.orm.utils.JsonUtils;
 import org.eco.vip.orm.utils.MapstructUtils;
 import org.eco.vip.orm.utils.ObjUtils;
@@ -121,7 +122,9 @@ public class OrgService extends BaseService<OrgMapper, Org> implements IOrgServi
     }
 
     @Override
-    public boolean hasChildByDeptId(List<String> ids) {
-        return false;
+    public boolean hasChildByIds(List<String> ids) {
+        QueryWrapper queryWrapper = query().where(ORG.PARENT_ID.in(ids));
+        List<Org> list = this.list(queryWrapper);
+        return CollUtils.isNotEmpty(list);
     }
 }