From 36b04d50b8f46c6f75ef07faeafa43839a064f27 Mon Sep 17 00:00:00 2001
From: dengqichen <dengqichen@iscmtech.com>
Date: Fri, 28 Nov 2025 18:01:27 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=9E=84=E5=BB=BA=E9=80=9A?=
 =?UTF-8?q?=E7=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ApplicationServiceImpl.java  | 32 +++++++++++++------
 1 file changed, 22 insertions(+), 10 deletions(-)

diff --git a/backend/src/main/java/com/qqchen/deploy/backend/deploy/service/impl/ApplicationServiceImpl.java b/backend/src/main/java/com/qqchen/deploy/backend/deploy/service/impl/ApplicationServiceImpl.java
index 46c9bc92..2f535bea 100644
--- a/backend/src/main/java/com/qqchen/deploy/backend/deploy/service/impl/ApplicationServiceImpl.java
+++ b/backend/src/main/java/com/qqchen/deploy/backend/deploy/service/impl/ApplicationServiceImpl.java
@@ -65,16 +65,16 @@ public class ApplicationServiceImpl extends BaseServiceImpl<Application, Applica
     @Resource
     private ExternalSystemConverter externalSystemConverter;
 
-    public Page<ApplicationDTO> page(ApplicationQuery query) {
-        Page<ApplicationDTO> page = super.page(query);
-        List<ApplicationDTO> content = page.getContent();
-        
-        if (content.isEmpty()) {
-            return page;
+    /**
+     * 填充应用的关联数据（分类和团队数量）
+     */
+    private void fillApplicationRelations(List<ApplicationDTO> applications) {
+        if (applications.isEmpty()) {
+            return;
         }
 
         // 批量查询应用分类
-        List<Long> categoryIds = content.stream()
+        List<Long> categoryIds = applications.stream()
             .map(ApplicationDTO::getApplicationCategoryId)
             .filter(java.util.Objects::nonNull)
             .distinct()
@@ -87,7 +87,7 @@ public class ApplicationServiceImpl extends BaseServiceImpl<Application, Applica
         }
 
         // 批量统计团队数量
-        List<Long> applicationIds = content.stream()
+        List<Long> applicationIds = applications.stream()
             .map(ApplicationDTO::getId)
             .collect(toList());
         java.util.Map<Long, Long> teamCountMap = new java.util.HashMap<>();
@@ -101,14 +101,26 @@ public class ApplicationServiceImpl extends BaseServiceImpl<Application, Applica
         }
 
         // 设置关联数据
-        content.forEach(application -> {
+        applications.forEach(application -> {
             if (application.getApplicationCategoryId() != null) {
                 application.setApplicationCategory(categoryMap.get(application.getApplicationCategoryId()));
             }
             application.setTeamCount(teamCountMap.getOrDefault(application.getId(), 0L));
         });
+    }
 
-        return new PageImpl<>(content, page.getPageable(), page.getTotalElements());
+    @Override
+    public Page<ApplicationDTO> page(ApplicationQuery query) {
+        Page<ApplicationDTO> page = super.page(query);
+        fillApplicationRelations(page.getContent());
+        return page;
+    }
+
+    @Override
+    public List<ApplicationDTO> findAll(ApplicationQuery query) {
+        List<ApplicationDTO> list = super.findAll(query);
+        fillApplicationRelations(list);
+        return list;
     }