update 拆分结果编辑 目录往一级拖动内容时，后拖入的，放在后面

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'
+      <if test="displaySeq != null">
           and display_seq > #{displaySeq}
-      order by display_seq desc
+      </if>
+
+      order by display_seq
     </select>
 
   <select id="queryByGTDisplaySeq" resultMap="BaseResultMap">

laws-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitMenuEOServiceImpl.java

@@ -377,10 +377,35 @@ public class SarFileSplitMenuEOServiceImpl extends ServiceImpl<SarFileSplitMenuE
     public void updateMenuLevel(String sourceIds, String parentId, Long displaySeq) {
         // 要移动到的节点信息
         SarFileSplitMenuEO parentMenu = baseMapper.findById(parentId);
-
+        Long menuDisplaySeq = parentMenu.getDisplaySeq();
-        // 获取要移动到的层级的最后一个 的排序值
-        List<SarFileSplitMenuEO> lastMenuList = getLastMenu(parentMenu.getId(),displaySeq);
         List<String> sourceIdList = Arrays.asList(sourceIds.split(","));
+
+        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();
@@ -390,17 +415,17 @@ public class SarFileSplitMenuEOServiceImpl extends ServiceImpl<SarFileSplitMenuE
             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);
             }
+        }
+
+
         //this.updateBatchById(updateList);
         // 要移动的节点所有子集（包括本身）
         //List<SarFileSplitMenuEO> sarFileSplitMenuEO1List = new ArrayList<>();