From 1fe78669700bf251fd11af760bbd3eb37b6697b0 Mon Sep 17 00:00:00 2001
From: chendaofei <857448963@qq.com>
Date: Wed, 9 Apr 2025 16:23:22 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9B=91=E6=B5=8B=E8=84=9A=E6=9C=AC=E6=8E=92?=
 =?UTF-8?q?=E5=BA=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../detection/handler/SocketDevResponseService.java | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/detection/src/main/java/com/njcn/gather/detection/handler/SocketDevResponseService.java b/detection/src/main/java/com/njcn/gather/detection/handler/SocketDevResponseService.java
index 5cfa5adb..79c50d4a 100644
--- a/detection/src/main/java/com/njcn/gather/detection/handler/SocketDevResponseService.java
+++ b/detection/src/main/java/com/njcn/gather/detection/handler/SocketDevResponseService.java
@@ -794,8 +794,19 @@ public class SocketDevResponseService {
                             }
                             //正式检测
                             sourceIssues = pqScriptDtlsService.listSourceIssue(issueParam);
-                            sourceIssues = sourceIssues.stream().sorted(Comparator.comparing(SourceIssue::getIndex)).collect(Collectors.groupingBy(SourceIssue::getType)).values().stream().flatMap(list->list.stream().sorted(Comparator.comparing(SourceIssue::getIndex))).collect(Collectors.toList());
+                            sourceIssues = sourceIssues.stream().sorted(Comparator.comparing(SourceIssue::getIndex)).collect(Collectors.toList());
+                            // 使用 LinkedHashMap 保持分组顺序
+                            Map<String, List<SourceIssue>> groupedIssues = sourceIssues.stream()
+                                    .collect(Collectors.groupingBy(
+                                            SourceIssue::getType,
+                                            LinkedHashMap::new,
+                                            Collectors.toList()
+                                    ));
 
+                            // 将分组后的元素合并成一个新的集合，保持原有顺序
+                            sourceIssues = groupedIssues.values().stream()
+                                    .flatMap(List::stream)
+                                    .collect(Collectors.toList());
                             // 存放所有检测小项
                             SocketManager.addSourceList(sourceIssues);
                             // 按照大项分组。key为大项code，value为小项个数