From ee337530c4d91aa498dd2ea8ae7badb430401b3e Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Fri, 13 Sep 2024 17:12:24 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E6=8B=86=E5=88=86=E7=BB=93=E6=9E=9C?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=20=E7=9B=AE=E5=BD=95=E5=BE=80=E4=B8=80?=
 =?UTF-8?q?=E7=BA=A7=E6=8B=96=E5=8A=A8=E5=86=85=E5=AE=B9=E6=97=B6=EF=BC=8C?=
 =?UTF-8?q?=E5=90=8E=E6=8B=96=E5=85=A5=E7=9A=84=EF=BC=8C=E6=94=BE=E5=9C=A8?=
 =?UTF-8?q?=E5=90=8E=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/xml/SarFileSplitMenuEOMapper.xml   |  7 +-
 .../impl/SarFileSplitMenuEOServiceImpl.java   | 69 +++++++++++++------
 2 files changed, 52 insertions(+), 24 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/split/mapper/xml/SarFileSplitMenuEOMapper.xml b/laws-modules/src/main/java/com/jero/modules/split/mapper/xml/SarFileSplitMenuEOMapper.xml
index 8d447559..85827283 100644
--- a/laws-modules/src/main/java/com/jero/modules/split/mapper/xml/SarFileSplitMenuEOMapper.xml
+++ b/laws-modules/src/main/java/com/jero/modules/split/mapper/xml/SarFileSplitMenuEOMapper.xml
@@ -375,8 +375,11 @@
       select * from SAR_FILE_SPLIT_MENU
       where parent_id = #{parentId}
       AND valid_flag = '0'
-      and display_seq > #{displaySeq}
-      order by display_seq desc
+      <if test="displaySeq != null">
+          and display_seq > #{displaySeq}
+      </if>
+
+      order by display_seq
     </select>
 
   <select id="queryByGTDisplaySeq" resultMap="BaseResultMap">
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 29212896..b7955d48 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
@@ -377,30 +377,55 @@ public class SarFileSplitMenuEOServiceImpl extends ServiceImpl<SarFileSplitMenuE
     public void updateMenuLevel(String sourceIds, String parentId, Long displaySeq) {
         // 要移动到的节点信息
         SarFileSplitMenuEO parentMenu = baseMapper.findById(parentId);
-
-        // 获取要移动到的层级的最后一个 的排序值
-        List<SarFileSplitMenuEO> lastMenuList = getLastMenu(parentMenu.getId(),displaySeq);
+        Long menuDisplaySeq = parentMenu.getDisplaySeq();
         List<String> sourceIdList = Arrays.asList(sourceIds.split(","));
-        int size = sourceIdList.size();
-        for (SarFileSplitMenuEO sarFileSplitMenuEO : lastMenuList) {
-            Long displaySeq1 = sarFileSplitMenuEO.getDisplaySeq();
-            sarFileSplitMenuEO.setDisplaySeq(displaySeq1+size);
-            baseMapper.updateByPrimaryKeySelective(sarFileSplitMenuEO);
-        }
-        if(displaySeq == 0){
-            displaySeq = parentMenu.getDisplaySeq();
-        }
-        //this.updateBatchById(lastMenuList);
-        List<SarFileSplitMenuEO> updateList = new ArrayList<>();
-        for (int i = 0; i < sourceIdList.size(); i++) {
-            String sourceId = sourceIdList.get(i);
-            // 要移动的节点信息
-            SarFileSplitMenuEO sarFileSplitMenuEO = baseMapper.findById(sourceId);
-            sarFileSplitMenuEO.setParentId(parentId);
-            sarFileSplitMenuEO.setDisplaySeq(displaySeq+i+1);
-            updateList.add(sarFileSplitMenuEO);
-            baseMapper.updateByPrimaryKeySelective(sarFileSplitMenuEO);
+
+        List<SarFileSplitMenuEO> lastMenuList;
+        //是否是放到最后
+        boolean equals = Objects.equals(menuDisplaySeq, displaySeq);
+        if (equals){
+            // 获取要移动到的层级的最后一个 的排序值
+            lastMenuList = getLastMenu(parentMenu.getId(),null);
+            int size = lastMenuList.size();
+            for (int i = 0; i < size; i++) {
+                SarFileSplitMenuEO sarFileSplitMenuEO = lastMenuList.get(i);
+                sarFileSplitMenuEO.setDisplaySeq(menuDisplaySeq+i+1);
+                baseMapper.updateByPrimaryKeySelective(sarFileSplitMenuEO);
+            }
+            if(displaySeq == 0){
+                displaySeq = menuDisplaySeq;
+            }
+            for (int i = 0; i < sourceIdList.size(); i++) {
+                String sourceId = sourceIdList.get(i);
+                // 要移动的节点信息
+                SarFileSplitMenuEO sarFileSplitMenuEO = baseMapper.findById(sourceId);
+                sarFileSplitMenuEO.setParentId(parentId);
+                sarFileSplitMenuEO.setDisplaySeq(displaySeq+size+i+1);
+                baseMapper.updateByPrimaryKeySelective(sarFileSplitMenuEO);
+            }
+        }else {
+            // 获取要移动到的层级的最后一个 的排序值
+            lastMenuList = getLastMenu(parentMenu.getId(),displaySeq);
+            int size = sourceIdList.size();
+            for (SarFileSplitMenuEO sarFileSplitMenuEO : lastMenuList) {
+                Long displaySeq1 = sarFileSplitMenuEO.getDisplaySeq();
+                sarFileSplitMenuEO.setDisplaySeq(displaySeq1+size);
+                baseMapper.updateByPrimaryKeySelective(sarFileSplitMenuEO);
+            }
+            if(displaySeq == 0){
+                displaySeq = parentMenu.getDisplaySeq();
+            }
+            for (int i = 0; i < sourceIdList.size(); i++) {
+                String sourceId = sourceIdList.get(i);
+                // 要移动的节点信息
+                SarFileSplitMenuEO sarFileSplitMenuEO = baseMapper.findById(sourceId);
+                sarFileSplitMenuEO.setParentId(parentId);
+                sarFileSplitMenuEO.setDisplaySeq(displaySeq+i+1);
+                baseMapper.updateByPrimaryKeySelective(sarFileSplitMenuEO);
+            }
         }
+
+
         //this.updateBatchById(updateList);
         // 要移动的节点所有子集（包括本身）
         //List<SarFileSplitMenuEO> sarFileSplitMenuEO1List = new ArrayList<>();