From 9423de8380a09f39ac19e2eb3a3fa07adb25ea7c Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Thu, 26 Sep 2024 18:09:48 +0800
Subject: [PATCH] =?UTF-8?q?update=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=20=E5=85=88=E6=8A=8A=E7=A7=BB=E5=8A=A8?=
 =?UTF-8?q?=E7=9A=84=E4=BD=8D=E7=BD=AE=E7=A9=BA=E5=87=BA=E6=9D=A5=EF=BC=8C?=
 =?UTF-8?q?=E5=9C=A8=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/SarFileSplitMenuEOServiceImpl.java   | 25 ++++++++-----------
 1 file changed, 11 insertions(+), 14 deletions(-)

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 3a5610b5..f30be9fa 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
@@ -394,8 +394,18 @@ public class SarFileSplitMenuEOServiceImpl extends ServiceImpl<SarFileSplitMenuE
             sarFileSplitMenuEO.setParentId(parentId);
             sarFileSplitMenuEO1List.add(sarFileSplitMenuEO);
         }
+
+
         List<SarFileSplitMenuEO> allList = new ArrayList<>();
         getChildren(allList, sarFileSplitMenuEO1List);
+        //获得要移动目录的大于排序的同级目录
+        List<SarFileSplitMenuEO> sarFileSplitMenuEOS = baseMapper.queryByGTDisplaySeq(parentMenu.getInfoId(),displaySeq);
+        for (int i = 0; i < sarFileSplitMenuEOS.size(); i++) {
+            SarFileSplitMenuEO sarFileSplitMenuEO = sarFileSplitMenuEOS.get(i);
+            sarFileSplitMenuEO.setDisplaySeq(displaySeq+allList.size()+i+1);
+            baseMapper.updateByPrimaryKeySelective(sarFileSplitMenuEO);
+        }
+
         //for (SarFileSplitMenuEO splitMenuEO : allList) {
         //    splitMenuEO.setParentId(parentId);
         //}
@@ -407,20 +417,7 @@ public class SarFileSplitMenuEOServiceImpl extends ServiceImpl<SarFileSplitMenuE
             sarFileSplitMenuEO.setDisplaySeq(displaySeq+i+1);
             baseMapper.updateByPrimaryKeySelective(sarFileSplitMenuEO);
         }
-        //获得要移动目录的大于排序的同级目录
-        String parentParentId = parentMenu.getParentId();
-        Long parentDisplaySeq = parentMenu.getDisplaySeq();
-        if (StringUtils.isNotBlank(parentParentId)){
-            List<SarFileSplitMenuEO> lastMenu = getLastMenu(parentParentId, parentDisplaySeq, new ArrayList<>());
-            List<SarFileSplitMenuEO> allList1 = new ArrayList<>();
-            getChildren(allList1, lastMenu);
-            for (int i = 0; i < allList1.size(); i++) {
-                SarFileSplitMenuEO sarFileSplitMenuEO = allList1.get(i);
-                Long displaySeq1 = sarFileSplitMenuEO.getDisplaySeq();
-                sarFileSplitMenuEO.setDisplaySeq(displaySeq1+allList.size()+i+1);
-                baseMapper.updateByPrimaryKeySelective(sarFileSplitMenuEO);
-            }
-        }
+
 
         //this.updateBatchById(updateList);
         // 要移动的节点所有子集（包括本身）