From 37f0361d92a8554841a5ce8086b6d6cfc6c94f99 Mon Sep 17 00:00:00 2001
From: dxfeng <dongxuefengdd@163.com>
Date: Wed, 3 Jul 2024 10:09:13 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8A=B1=E5=90=8D=E5=86=8C=E6=A0=91=EF=BC=8C?=
 =?UTF-8?q?=E5=90=8C=E7=BA=A7=E6=83=85=E5=86=B5=E4=B8=8B=EF=BC=8C=E9=83=A8?=
 =?UTF-8?q?=E9=97=A8=E5=B1=95=E7=A4=BA=E5=9C=A8=E5=88=86=E9=83=A8=E5=89=8D?=
 =?UTF-8?q?=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/com/engine/organization/util/tree/SearchTreeUtil.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/com/engine/organization/util/tree/SearchTreeUtil.java b/src/com/engine/organization/util/tree/SearchTreeUtil.java
index 65dd9617..b1065faa 100644
--- a/src/com/engine/organization/util/tree/SearchTreeUtil.java
+++ b/src/com/engine/organization/util/tree/SearchTreeUtil.java
@@ -124,8 +124,8 @@ public class SearchTreeUtil {
                 List<SearchTree> searchTrees = childMap.get(e.getId()).stream().sorted(Comparator.comparing(SearchTree::getOrderNum)).collect(Collectors.toList());
                 treeNodes.addAll(searchTrees);
             }
-            if (CollectionUtils.isNotEmpty(e.getSubs())) {
-                treeNodes.addAll(e.getSubs());
+            if(CollectionUtils.isNotEmpty(treeNodes)){
+                treeNodes = treeNodes.stream().sorted(Comparator.comparing(TreeNode::getType).reversed()).collect(Collectors.toCollection(LinkedHashSet::new));
             }
             e.setSubs(new ArrayList<>(treeNodes));
             leafIds.add(e.getId());