From 46fda86ec9b94b4cdcc618e576514e5de868eb38 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Fri, 27 Sep 2024 11:38:07 +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=20=E7=B2=BE=E7=AE=80=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/SarFileSplitMenuEOServiceImpl.java   | 55 ++-----------------
 1 file changed, 5 insertions(+), 50 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 f30be9fa..0100df70 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
@@ -381,12 +381,8 @@ public class SarFileSplitMenuEOServiceImpl extends ServiceImpl<SarFileSplitMenuE
         SarFileSplitMenuEO parentMenu = baseMapper.findById(parentId);
 
         List<String> sourceIdList = Arrays.asList(sourceIds.split(","));
-        // 获取要移动到的层级的最后一个 的排序值
-        List<SarFileSplitMenuEO> lastMenuList = getLastMenu(parentMenu.getId(),displaySeq,sourceIdList);
-        if (CollectionUtil.isNotEmpty(lastMenuList)){
-            displaySeq = lastMenuList.stream().map(SarFileSplitMenuEO::getDisplaySeq).min(Comparator.comparing(x -> x)).orElse(null);
-        }
-        // 要移动的节点所有子集（包括本身）
+
+        // 更新要移动的节点的父级id
         List<SarFileSplitMenuEO> sarFileSplitMenuEO1List = new ArrayList<>();
         for (String sourceId : sourceIdList) {
             // 要移动的节点信息
@@ -395,10 +391,10 @@ public class SarFileSplitMenuEOServiceImpl extends ServiceImpl<SarFileSplitMenuE
             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);
@@ -406,53 +402,12 @@ public class SarFileSplitMenuEOServiceImpl extends ServiceImpl<SarFileSplitMenuE
             baseMapper.updateByPrimaryKeySelective(sarFileSplitMenuEO);
         }
 
-        //for (SarFileSplitMenuEO splitMenuEO : allList) {
-        //    splitMenuEO.setParentId(parentId);
-        //}
-        //排除
-        getChildren(allList, lastMenuList);
-
+        //移动要移动的子父级目录
         for (int i = 0; i < allList.size(); i++) {
             SarFileSplitMenuEO sarFileSplitMenuEO = allList.get(i);
             sarFileSplitMenuEO.setDisplaySeq(displaySeq+i+1);
             baseMapper.updateByPrimaryKeySelective(sarFileSplitMenuEO);
         }
-
-
-        //this.updateBatchById(updateList);
-        // 要移动的节点所有子集（包括本身）
-        //List<SarFileSplitMenuEO> sarFileSplitMenuEO1List = new ArrayList<>();
-        //sarFileSplitMenuEO1List.add(sarFileSplitMenuEO1);
-        //List<SarFileSplitMenuEO> allList = new ArrayList<>();
-        //getChildren(allList, sarFileSplitMenuEO1List);
-        //List<String> idlist = new ArrayList<>();
-        //
-        //// 更新要移动节点及其子集的排序
-        //for (int i = 0; i <allList.size(); i++) {
-        //    SarFileSplitMenuEO sarFileSplitMenuEO = allList.get(i);
-        //    if (!Objects.equals(sarFileSplitMenuEO.getId(), lastMenu.getId())){
-        //        sarFileSplitMenuEO.setDisplaySeq(lastMenu.getDisplaySeq() + i + 1);
-        //    }
-        //    idlist.add(sarFileSplitMenuEO.getId());
-        //    baseMapper.updateByPrimaryKeySelective(sarFileSplitMenuEO);
-        //}
-        //Long displaySeq = allList.get(allList.size() - 1).getDisplaySeq();
-        //
-        //// 更新 大于 要移动到节点最后节点 的节点排序值
-        //List<SarFileSplitMenuEO> sarFileSplitMenuEOList =
-        //        baseMapper.queryByGTDisplaySeq(sarFileSplitMenuEO1.getInfoId(), lastMenu.getDisplaySeq());
-        //sarFileSplitMenuEOList = sarFileSplitMenuEOList.stream()
-        //        .filter(v -> !idlist.contains(v.getId())).collect(Collectors.toList());
-        //for (int i = 0; i < sarFileSplitMenuEOList.size(); i++) {
-        //    // 更新排序
-        //    SarFileSplitMenuEO fileSplitMenuEO = sarFileSplitMenuEOList.get(i);
-        //    fileSplitMenuEO.setDisplaySeq(displaySeq + i + 1);
-        //    baseMapper.updateByPrimaryKeySelective(fileSplitMenuEO);
-        //}
-        //
-        //// 更新要移动节点的parentId
-        //sarFileSplitMenuEO1.setParentId(parentId);
-        //baseMapper.updateByPrimaryKeySelective(sarFileSplitMenuEO1);
     }
 
     private void getChildren(List<SarFileSplitMenuEO> allList, List<SarFileSplitMenuEO> sarFileSplitMenuEOList) {