From 91b9572974fcfa6d9cc4303a56c4d5d2079204e3 Mon Sep 17 00:00:00 2001
From: "SGK\\17962" <1796293269@qq.com>
Date: Wed, 26 Nov 2025 09:07:18 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=84=E5=90=8D=E7=A7=B0=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/controller/GroupConfigController.java      |  2 +-
 .../server/web/service/GroupConfigService.java     |  2 +-
 .../web/service/impl/GroupConfigServiceImpl.java   | 14 +++++++++-----
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/controller/GroupConfigController.java b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/controller/GroupConfigController.java
index 9d7b6f13..651457f9 100644
--- a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/controller/GroupConfigController.java
+++ b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/controller/GroupConfigController.java
@@ -80,7 +80,7 @@ public class GroupConfigController {
 
     @LoginRequired
     @GetMapping("/all/group-name/list")
-    public List<String> getAllGroupNameList() {
+    public List<GroupConfigResponseVO> getAllGroupNameList() {
         return groupConfigService.getAllGroupNameList();
     }
 
diff --git a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/GroupConfigService.java b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/GroupConfigService.java
index 7d3186ef..47703407 100644
--- a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/GroupConfigService.java
+++ b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/GroupConfigService.java
@@ -30,7 +30,7 @@ public interface GroupConfigService {
 
     List<GroupConfigResponseVO> getAllGroupConfigList(final List<String> namespaceId);
 
-    List<String> getAllGroupNameList();
+    List<GroupConfigResponseVO> getAllGroupNameList();
 
     List<String> getOnlinePods(String groupName);
 
diff --git a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/GroupConfigServiceImpl.java b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/GroupConfigServiceImpl.java
index 2dbe86f4..ae72cde1 100644
--- a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/GroupConfigServiceImpl.java
+++ b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/GroupConfigServiceImpl.java
@@ -254,7 +254,7 @@ public class GroupConfigServiceImpl implements GroupConfigService {
     }
 
     @Override
-    public List<String> getAllGroupNameList() {
+    public List<GroupConfigResponseVO> getAllGroupNameList() {
 
         UserSessionVO userSessionVO = UserSessionUtils.currentUserSession();
         if (userSessionVO.isUser()) {
@@ -265,17 +265,21 @@ public class GroupConfigServiceImpl implements GroupConfigService {
             }
             List<GroupConfig> groupConfigs = groupConfigAccess.list(
                     new LambdaQueryWrapper<GroupConfig>()
+                            .select(GroupConfig::getGroupNameCn,GroupConfig::getGroupName)
                             .in(CollUtil.isNotEmpty(groupNames), GroupConfig::getGroupName, groupNames)
                             .eq(GroupConfig::getNamespaceId, userSessionVO.getNamespaceId()));
-            return StreamUtils.toList(groupConfigs, GroupConfig::getGroupNameCn);
+            List<GroupConfigResponseVO> groupConfigResponses = GroupConfigResponseVOConverter.INSTANCE.convertList(
+                    groupConfigs);
+            return groupConfigResponses;
         }
 
         ConfigAccess<GroupConfig> groupConfigAccess = accessTemplate.getGroupConfigAccess();
         List<GroupConfig> groupConfigs = groupConfigAccess.list(new LambdaQueryWrapper<GroupConfig>()
                 .eq(GroupConfig::getNamespaceId, userSessionVO.getNamespaceId())
-                .select(GroupConfig::getGroupNameCn));
-    //TODO ?
-        return StreamUtils.toList(groupConfigs, GroupConfig::getGroupNameCn);
+                .select(GroupConfig::getGroupNameCn,GroupConfig::getGroupName));
+        List<GroupConfigResponseVO> groupConfigResponses = GroupConfigResponseVOConverter.INSTANCE.convertList(
+                groupConfigs);
+        return groupConfigResponses;
     }
 
     @Override