From c7c87c7449605975915a08b0785f1b7018fdc39c Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Sat, 14 Sep 2024 17:15:23 +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=E4=B8=8D=E8=83=BD?=
 =?UTF-8?q?=E6=8B=96=E5=8A=A8=E5=88=B0=E4=B8=8A=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/SarFileSplitMenuEOServiceImpl.java    | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 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 4e31bfa1..abbfa5ce 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
@@ -1,5 +1,6 @@
 package com.jero.modules.split.service.impl;
 
+import cn.hutool.core.collection.CollStreamUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -386,17 +387,19 @@ public class SarFileSplitMenuEOServiceImpl extends ServiceImpl<SarFileSplitMenuE
         }
         // 要移动的节点所有子集（包括本身）
         List<SarFileSplitMenuEO> sarFileSplitMenuEO1List = new ArrayList<>();
+        List<String> idList = new ArrayList<>();
         for (int i = 0; i < sourceIdList.size(); i++) {
             String sourceId = sourceIdList.get(i);
             // 要移动的节点信息
             SarFileSplitMenuEO sarFileSplitMenuEO = baseMapper.findById(sourceId);
             sarFileSplitMenuEO.setParentId(parentId);
             sarFileSplitMenuEO1List.add(sarFileSplitMenuEO);
-
+            idList.add(sourceId);
         }
-        sarFileSplitMenuEO1List.addAll(lastMenuList);
         List<SarFileSplitMenuEO> allList = new ArrayList<>();
         getChildren(allList, sarFileSplitMenuEO1List);
+        //排除
+        getChildren(allList, lastMenuList);
 
         for (int i = 0; i < allList.size(); i++) {
             SarFileSplitMenuEO sarFileSplitMenuEO = allList.get(i);
@@ -442,10 +445,15 @@ public class SarFileSplitMenuEOServiceImpl extends ServiceImpl<SarFileSplitMenuE
 
     private void getChildren(List<SarFileSplitMenuEO> allList, List<SarFileSplitMenuEO> sarFileSplitMenuEOList) {
         for (SarFileSplitMenuEO sarFileSplitMenuEO : sarFileSplitMenuEOList) {
+            String id = sarFileSplitMenuEO.getId();
+            List<String> idList = CollStreamUtil.toList(allList, SarFileSplitMenuEO::getId);
+            if (idList.contains(id)){
+                continue;
+            }
             allList.add(sarFileSplitMenuEO);
-            List<SarFileSplitMenuEO> childrenList = baseMapper.findByParentId(sarFileSplitMenuEO.getId());
-            if (CollectionUtils.isNotEmpty(childrenList)){
-                getChildren(allList, childrenList);
+            List<SarFileSplitMenuEO> childrenList = baseMapper.findByParentId(id);
+            if (CollectionUtils.ist, cisNotEmpty(childrenList)){
+                    getChildren(allLhildrenList);
             }
         }
     }