From f54b66092ce17cc5a2649f568b3e11aa66782ab1 Mon Sep 17 00:00:00 2001
From: haozq <123456>
Date: Wed, 28 Feb 2024 16:58:13 +0800
Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/base/controller/SelectController.java      |  2 +-
 .../system/base/mapper/ISelectMapper.java             |  2 +-
 .../system/base/service/ISelectService.java           |  2 +-
 .../system/base/service/impl/SelectServiceImpl.java   |  4 +++-
 .../com/securitycontrol/system/mapper/DictMapper.java |  6 ++++++
 .../system/service/DictServiceImpl.java               | 10 ++++++++++
 .../system/service/OrgServiceImpl.java                | 11 ++++++++---
 .../src/main/resources/mapper/DictMapper.xml          | 10 ++++++++--
 8 files changed, 38 insertions(+), 9 deletions(-)

diff --git a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/controller/SelectController.java b/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/controller/SelectController.java
index 4c606d9..769312b 100644
--- a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/controller/SelectController.java
+++ b/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/controller/SelectController.java
@@ -43,7 +43,7 @@ public class SelectController extends BaseController {
     }
     @ApiOperation(value = "字典下拉选")
     @PostMapping("getDictList")
-    public AjaxResult getDictList(Integer code){
+    public AjaxResult getDictList(String code){
         return service.getDictList(code);
     }
 
diff --git a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/mapper/ISelectMapper.java b/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/mapper/ISelectMapper.java
index 430e421..68e53a7 100644
--- a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/mapper/ISelectMapper.java
+++ b/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/mapper/ISelectMapper.java
@@ -51,5 +51,5 @@ public interface ISelectMapper {
      * @param code
      * @return
      */
-    List<TreeNode> getDictList(@Param("code") Integer code);
+    List<TreeNode> getDictList(@Param("code") String code);
 }
diff --git a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/ISelectService.java b/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/ISelectService.java
index cd938b8..3d48512 100644
--- a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/ISelectService.java
+++ b/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/ISelectService.java
@@ -46,5 +46,5 @@ public interface ISelectService {
      * @param code
      * @return
      */
-    AjaxResult getDictList(Integer code);
+    AjaxResult getDictList(String code);
 }
diff --git a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/impl/SelectServiceImpl.java b/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/impl/SelectServiceImpl.java
index 4deb8bd..2246356 100644
--- a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/impl/SelectServiceImpl.java
+++ b/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/impl/SelectServiceImpl.java
@@ -7,6 +7,7 @@ import com.securitycontrol.entity.system.vo.SelectVo;
 import com.securitycontrol.entity.system.vo.TreeNode;
 import com.securitycontrol.system.base.mapper.ISelectMapper;
 import com.securitycontrol.system.base.service.ISelectService;
+import io.swagger.models.auth.In;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.stereotype.Service;
@@ -80,9 +81,10 @@ public class SelectServiceImpl implements ISelectService {
      * @return
      */
     @Override
-    public AjaxResult getDictList(Integer code) {
+    public AjaxResult getDictList(String code) {
         List<TreeNode> groupList = new ArrayList<>();
         try {
+
             List<TreeNode> list = mapper.getDictList(code);
             if (CollectionUtils.isNotEmpty(list)) {
                 // 创建树形结构（数据集合作为参数）
diff --git a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/mapper/DictMapper.java b/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/mapper/DictMapper.java
index 4dc8036..2780166 100644
--- a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/mapper/DictMapper.java
+++ b/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/mapper/DictMapper.java
@@ -61,4 +61,10 @@ public interface DictMapper {
      * @return
      */
     DictVo getDetails(String id);
+
+    /**
+     * 修改子节点编码
+     * @param dto
+     */
+    void updateChildCode(DictVo dto);
 }
diff --git a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/service/DictServiceImpl.java b/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/service/DictServiceImpl.java
index e573833..68652d5 100644
--- a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/service/DictServiceImpl.java
+++ b/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/service/DictServiceImpl.java
@@ -84,6 +84,14 @@ public class DictServiceImpl  implements DictService {
         @Override
         public Result<String> updateDict(DictVo dto) {
            try{
+               //查询数据
+               DictVo vo=mapper.getDetails(dto.getDictId().toString());
+               if(vo==null){
+                   return Result.fail("数据不存在");
+               }
+               if(vo.getDictCode().equals(dto.getPidCode())){
+                   return Result.fail("父节点不能是自己");
+               }
                if(dto.getPidCode()==null){
                    dto.setPidCode(0);
                }
@@ -92,6 +100,8 @@ public class DictServiceImpl  implements DictService {
                    return res;
                }
                int num=mapper.updateDict(dto);
+               vo.setPidCode(dto.getDictCode());
+               mapper.updateChildCode(vo);
                if(num>0){
                    return Result.ok("修改成功");
                }
diff --git a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/service/OrgServiceImpl.java b/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/service/OrgServiceImpl.java
index cb8fdeb..225ab90 100644
--- a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/service/OrgServiceImpl.java
+++ b/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/service/OrgServiceImpl.java
@@ -8,9 +8,7 @@ import com.securitycontrol.entity.system.dto.OrgDto;
 import com.securitycontrol.entity.system.vo.OrgVo;
 import com.securitycontrol.system.mapper.OrgMapper;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.poi.ss.formula.functions.T;
 import org.springframework.stereotype.Service;
-import sun.plugin.util.UIUtil;
 
 import javax.annotation.Resource;
 import java.util.ArrayList;
@@ -104,8 +102,15 @@ public class OrgServiceImpl implements OrgService{
     @Override
     public Result<String> updateOrg(OrgVo dto) {
         try{
+            OrgVo orgVo=mapper.getDetails(dto.getOrgId());
+            if(orgVo==null){
+                return Result.fail("数据不存在");
+            }
+            if(orgVo.getOrgId().equals(dto.getPId())){
+                return Result.fail("父节点不能是自己");
+            }
             if(StringHelper.isEmpty(dto.getOrgId())){
-                return Result.ok("主键不能为空");
+                return Result.fail("主键不能为空");
             }
             if(StringHelper.isEmpty(dto.getPId())){
                 dto.setPId("0");
diff --git a/securitycontrol-model/securitycontrol-system/src/main/resources/mapper/DictMapper.xml b/securitycontrol-model/securitycontrol-system/src/main/resources/mapper/DictMapper.xml
index cfd7379..424e6e8 100644
--- a/securitycontrol-model/securitycontrol-system/src/main/resources/mapper/DictMapper.xml
+++ b/securitycontrol-model/securitycontrol-system/src/main/resources/mapper/DictMapper.xml
@@ -61,13 +61,19 @@
     <!--修改-->
     <update id="updateDict">
         update  sys_dict
-        set   dict_code=#{dictCode},dict_name=#{dictName},dict_sort=#{dictValue},remarks=#{remarks}
+        set   dict_code=#{dictCode},dict_name=#{dictName},dict_sort=#{dictValue},remarks=#{remarks},p_code=#{pidCode}
               where  dict_id=#{dictId};
     </update>
+
+    <update id="updateChildCode">
+        update  sys_dict
+            set   p_code=#{pidCode}
+                where  p_code=#{dictCode};
+    </update>
     <!--删除-->
     <delete id="delDict">
         update  sys_dict
-        set   p_code=1
+             set   del_flag=1
         where  dict_id=#{dictId};
     </delete>
 </mapper>
\ No newline at end of file