From 90d84a74435ceb65b95a29dce8e7d3a5caf6efd4 Mon Sep 17 00:00:00 2001
From: "zhaokaiyao@91isoft.com" <6922339zky>
Date: Wed, 1 Dec 2021 19:00:55 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A8=A1=E5=9D=97=E7=BB=93=E6=9E=84=E5=8D=95?=
 =?UTF-8?q?=E5=85=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/SarModelTreeServiceImpl.java       | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/service/impl/SarModelTreeServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/service/impl/SarModelTreeServiceImpl.java
index faba2999..ee783e2a 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/service/impl/SarModelTreeServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/service/impl/SarModelTreeServiceImpl.java
@@ -8,6 +8,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 /**
  * <p>
@@ -62,8 +64,11 @@ public class SarModelTreeServiceImpl extends ServiceImpl<SarModelTreeDao, SarMod
 //            sarMenu.setChildren(recursionGetChildren((sarMenu)));
 //        }
 
-        children.forEach(item->{
-            switch (item.getHasChildren()){
+        List<SarModelTree> collect = children.stream()
+                .filter(item -> !parent.getModel().equals(item.getModel())).collect(Collectors.toList());
+
+        collect.forEach(item-> {
+            switch (item.getHasChildren()) {
                 case "0":
                     item.setLeaf(true);
                     break;
@@ -73,6 +78,8 @@ public class SarModelTreeServiceImpl extends ServiceImpl<SarModelTreeDao, SarMod
             }
             item.setId(item.getName());
         });
-        return children;
+
+
+        return collect;
     }
 }