From 3f8a3446f843fb542add1cfb775afed27915286a Mon Sep 17 00:00:00 2001
From: Your Name <your.email@example.com>
Date: Sat, 17 Jan 2026 10:21:24 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=8E=A5=E5=8D=95=E9=83=A8=E9=97=A8?=
 =?UTF-8?q?=E5=88=86=E6=9E=90=E6=98=BE=E7=A4=BA=E6=89=80=E6=9C=89=E6=8E=A5?=
 =?UTF-8?q?=E5=8D=95=E9=83=A8=E9=97=A8=EF=BC=88=E5=8C=85=E6=8B=AC=E6=B2=A1?=
 =?UTF-8?q?=E6=9C=89=E4=BB=BB=E5=8A=A1=E7=9A=84=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../designhub/service/AnalyticsService.java   | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/backend/src/main/java/com/designhub/service/AnalyticsService.java b/backend/src/main/java/com/designhub/service/AnalyticsService.java
index bb0d974..3c2a8d1 100644
--- a/backend/src/main/java/com/designhub/service/AnalyticsService.java
+++ b/backend/src/main/java/com/designhub/service/AnalyticsService.java
@@ -2092,9 +2092,15 @@ public class AnalyticsService {
         Map<Long, Long> deptParentIds = departments.stream()
             .collect(Collectors.toMap(d -> d.getId(), d -> d.getParentId() != null ? d.getParentId() : 0L, (a, b) -> a));
         
-        // 🔥 获取每个部门的人数（包含部门负责人）
+        // 🔥 获取所有接单类型的部门（包括没有任务的）
+        List<Department> receivingDepts = departments.stream()
+            .filter(d -> "receiving".equals(d.getDeptType()) && d.getStatus() != null && d.getStatus() == 1)
+            .collect(Collectors.toList());
+        
+        // 🔥 获取每个接单部门的人数（包含部门负责人）
         Map<Long, Integer> deptMemberCounts = new HashMap<>();
-        for (Long deptId : tasksByDept.keySet()) {
+        for (Department dept : receivingDepts) {
+            Long deptId = dept.getId();
             // 查询该部门及其子部门的所有用户数量
             List<Long> deptAndChildIds = getDeptAndChildIds(deptId);
             Long memberCount = userMapper.selectCount(new LambdaQueryWrapper<User>()
@@ -2106,9 +2112,10 @@ public class AnalyticsService {
             deptMemberCounts.put(deptId, memberCount.intValue() + leaderCount);
         }
         
-        for (Map.Entry<Long, List<Task>> entry : tasksByDept.entrySet()) {
-            Long deptId = entry.getKey();
-            List<Task> deptTasks = entry.getValue();
+        // 🔥 遍历所有接单部门（包括没有任务的）
+        for (Department dept : receivingDepts) {
+            Long deptId = dept.getId();
+            List<Task> deptTasks = tasksByDept.getOrDefault(deptId, Collections.emptyList());
             
             DimensionAnalysisVO.ReceivingDeptAnalysis analysis = new DimensionAnalysisVO.ReceivingDeptAnalysis();
             analysis.setDeptId(deptId);
@@ -2194,7 +2201,7 @@ public class AnalyticsService {
             result.add(analysis);
         }
         
-        // 按任务数量降序排序
+        // 按任务数量降序排序（有任务的排前面）
         result.sort((a, b) -> Integer.compare(b.getTotalTasks(), a.getTotalTasks()));
         
         return result;