From f657069a06bf6173d164a80673736b78da2a4b55 Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Sun, 26 Nov 2023 10:40:00 +0800
Subject: [PATCH] fix: 78645
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

体系搜索--弹窗中列表中的数据的默认排序未按需求文档中描述的进行排序
---
 .../impl/SarMenuStandardNewServiceNewImpl.java       |  5 ++++-
 .../sys/sarMenuStandard/entity/SarMenuStandard.java  | 12 ++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/impl/SarMenuStandardNewServiceNewImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/impl/SarMenuStandardNewServiceNewImpl.java
index 283d9975..52f025a0 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/impl/SarMenuStandardNewServiceNewImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/impl/SarMenuStandardNewServiceNewImpl.java
@@ -51,6 +51,7 @@ import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.util.*;
+import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Collectors;
 
 /**
@@ -251,7 +252,9 @@ public class SarMenuStandardNewServiceNewImpl extends ServiceImpl<SarMenuStandar
         sarMenuStandard.buildPathMap(pathMap, "");
 
         // 为树设置systemSort
-        SarMenuStandard.setSystemSort(sarMenuStandard, "");
+//        SarMenuStandard.setSystemSort(sarMenuStandard, "");
+        AtomicInteger currentNumber = new AtomicInteger(1);
+        SarMenuStandard.setSystemSortDFS(sarMenuStandard, currentNumber);
 
         // 国标外标标准状态字典
         List<TsDicType> gbStateDictList = dicItemService.selectAllDicTypeNameByDicCode("STANDSTATE");
diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/sarMenuStandard/entity/SarMenuStandard.java b/adc-da-sys/src/main/java/com/adc/da/sys/sarMenuStandard/entity/SarMenuStandard.java
index a6393c0b..356328b5 100644
--- a/adc-da-sys/src/main/java/com/adc/da/sys/sarMenuStandard/entity/SarMenuStandard.java
+++ b/adc-da-sys/src/main/java/com/adc/da/sys/sarMenuStandard/entity/SarMenuStandard.java
@@ -19,6 +19,7 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.atomic.AtomicInteger;
 
 /**
  * <p>
@@ -218,4 +219,15 @@ public class  SarMenuStandard extends BaseEntity {
             setSystemSort(child, currentSort);
         }
     }
+
+    // 新增的深度优先遍历方法
+    public static void setSystemSortDFS(SarMenuStandard node, AtomicInteger currentNumber) {
+        if (node == null) {
+            return;
+        }
+        node.setSystemSort(currentNumber.getAndIncrement());
+        for (SarMenuStandard child : node.getChildren()) {
+            setSystemSortDFS(child, currentNumber);
+        }
+    }
 }