From ea0654f28eb1b65982a4062a5a46390bfe87d852 Mon Sep 17 00:00:00 2001
From: yjz <3131811435@qq.com>
Date: Fri, 16 Aug 2024 09:38:28 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=A0=87=E5=87=86=E6=8B=86=E5=88=86?=
 =?UTF-8?q?=E6=9D=A1=E6=AC=BE=E7=9B=AE=E5=BD=95-=E7=A7=BB=E5=8A=A8?=
 =?UTF-8?q?=E5=B1=82=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SarFileSplitMenuEOController.java         |  7 ++--
 .../service/ISarFileSplitMenuEOService.java   |  2 +-
 .../impl/SarFileSplitMenuEOServiceImpl.java   | 35 ++++++++++---------
 3 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/split/controller/SarFileSplitMenuEOController.java b/laws-modules/src/main/java/com/jero/modules/split/controller/SarFileSplitMenuEOController.java
index c188d838..375320a9 100644
--- a/laws-modules/src/main/java/com/jero/modules/split/controller/SarFileSplitMenuEOController.java
+++ b/laws-modules/src/main/java/com/jero/modules/split/controller/SarFileSplitMenuEOController.java
@@ -68,11 +68,12 @@ public class SarFileSplitMenuEOController extends JeroController<SarFileSplitMen
         return Result.OK(MessageUtils.getMessage(ResultCommon.EDIT_OK),sarFileSplitMenuEO);
     }
 
-    @ApiOperation(value = "标准拆分条款目录-修改层级")
+    @ApiOperation(value = "标准拆分条款目录-移动层级")
     @GetMapping("/updateMenuLevel")
 //    @RequiresPermissions("split:sarFileSplitMenu:updateMenuLevel")
-    public Result<SarFileSplitMenuEO> updateMenuLevel(String id, String parentId) {
-        sarFileSplitMenuEOService.updateMenuLevel(id, parentId);
+    public Result<SarFileSplitMenuEO> updateMenuLevel(@ApiParam(value = "要移动的节点id")String sourceId,
+                                                      @ApiParam(value = "要移动到的节点id")String targetId) {
+        sarFileSplitMenuEOService.updateMenuLevel(sourceId, targetId);
         return Result.OK(MessageUtils.getMessage(ResultCommon.OK));
     }
 
diff --git a/laws-modules/src/main/java/com/jero/modules/split/service/ISarFileSplitMenuEOService.java b/laws-modules/src/main/java/com/jero/modules/split/service/ISarFileSplitMenuEOService.java
index 25abf27c..5d6af30b 100644
--- a/laws-modules/src/main/java/com/jero/modules/split/service/ISarFileSplitMenuEOService.java
+++ b/laws-modules/src/main/java/com/jero/modules/split/service/ISarFileSplitMenuEOService.java
@@ -58,5 +58,5 @@ public interface ISarFileSplitMenuEOService extends IService<SarFileSplitMenuEO>
 
     Result moveUpOrDown(JSONObject json);
 
-    void updateMenuLevel(String id, String parentId);
+    void updateMenuLevel(String sourceId, String targetId);
 }
diff --git a/laws-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitMenuEOServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitMenuEOServiceImpl.java
index 59058a13..7c7f223a 100644
--- a/laws-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitMenuEOServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitMenuEOServiceImpl.java
@@ -374,40 +374,43 @@ public class SarFileSplitMenuEOServiceImpl extends ServiceImpl<SarFileSplitMenuE
     }
 
     @Override
-    public void updateMenuLevel(String id, String parentId) {
+    public void updateMenuLevel(String sourceId, String targetId) {
+        // 要移动的节点信息
+        SarFileSplitMenuEO sarFileSplitMenuEO1 = baseMapper.findById(sourceId);
+        // 要移动到的节点信息
+        SarFileSplitMenuEO sarFileSplitMenuEO2 = baseMapper.findById(targetId);
         // 获取要移动到的层级的最后一个 的排序值
-        SarFileSplitMenuEO lastMenu = getLastMenu(parentId);
+        SarFileSplitMenuEO lastMenu = getLastMenu(sarFileSplitMenuEO2.getPId());
 
-        // 查询当前节点和当前节点所有子集
-        SarFileSplitMenuEO sarFileSplitMenuEO1 = baseMapper.findById(id);
+        // 要移动的节点所有子集（包括本身）
         List<SarFileSplitMenuEO> sarFileSplitMenuEO1List = new ArrayList<>();
         sarFileSplitMenuEO1List.add(sarFileSplitMenuEO1);
         List<SarFileSplitMenuEO> allList = new ArrayList<>();
         getChildren(allList, sarFileSplitMenuEO1List);
 
-        // 获取要移动节点的数量
-        int childCount = allList.size();
+        // 要移动节点的数量
+        int moveNodeCount = allList.size();
 
-        // 更新下节点排序
-        SarFileSplitMenuEO parentSarFileSplitMenu = baseMapper.findById(parentId);
+        // 更新 大于 要移动到节点最后节点 的节点排序值
         List<SarFileSplitMenuEO> sarFileSplitMenuEOList =
-                baseMapper.queryByGTDisplaySeq(parentSarFileSplitMenu.getInfoId(), lastMenu.getDisplaySeq());
+                baseMapper.queryByGTDisplaySeq(sarFileSplitMenuEO1.getInfoId(), lastMenu.getDisplaySeq());
         for (SarFileSplitMenuEO fileSplitMenuEO : sarFileSplitMenuEOList) {
             // 更新排序
-            fileSplitMenuEO.setDisplaySeq(fileSplitMenuEO.getDisplaySeq() + childCount);
+            fileSplitMenuEO.setDisplaySeq(fileSplitMenuEO.getDisplaySeq() + moveNodeCount);
             baseMapper.updateByPrimaryKeySelective(fileSplitMenuEO);
         }
 
-        // 更新要移动节点的排序
+        // 更新要移动节点及其子集的排序
         for (int i = 0; i <allList.size(); i++) {
-            SarFileSplitMenuEO sarFileSplitMenuEO2 = allList.get(i);
-            sarFileSplitMenuEO2.setDisplaySeq(lastMenu.getDisplaySeq() + i + 1);
-            baseMapper.updateByPrimaryKeySelective(sarFileSplitMenuEO2);
+            SarFileSplitMenuEO sarFileSplitMenuEO = allList.get(i);
+            sarFileSplitMenuEO.setDisplaySeq(lastMenu.getDisplaySeq() + i + 1);
+            baseMapper.updateByPrimaryKeySelective(sarFileSplitMenuEO);
         }
 
+        // 更新要移动节点的pId
         SarFileSplitMenuEO sarFileSplitMenuEO = new SarFileSplitMenuEO();
-        sarFileSplitMenuEO.setId(id);
-        sarFileSplitMenuEO.setPId(parentId);
+        sarFileSplitMenuEO.setId(sourceId);
+        sarFileSplitMenuEO.setPId(sarFileSplitMenuEO2.getPId());
         baseMapper.updateByPrimaryKeySelective(sarFileSplitMenuEO);
     }