From 5c1d938183fb16545b9bff0ce76d47b9919abda0 Mon Sep 17 00:00:00 2001
From: Your Name <your.email@example.com>
Date: Sat, 17 Jan 2026 10:16:40 +0800
Subject: [PATCH] =?UTF-8?q?fix:=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=E5=AE=8C=E6=95=B4=E9=83=A8?=
 =?UTF-8?q?=E9=97=A8=E5=B1=82=E7=BA=A7=E5=90=8D=E7=A7=B0=EF=BC=88=E7=88=B6?=
 =?UTF-8?q?=E9=83=A8=E9=97=A8-=E5=AD=90=E9=83=A8=E9=97=A8=EF=BC=89?=
 =?UTF-8?q?=E9=81=BF=E5=85=8D=E5=90=8C=E5=90=8D=E6=B7=B7=E6=B7=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/designhub/service/AnalyticsService.java    | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/backend/src/main/java/com/designhub/service/AnalyticsService.java b/backend/src/main/java/com/designhub/service/AnalyticsService.java
index 2a02fbc..bb0d974 100644
--- a/backend/src/main/java/com/designhub/service/AnalyticsService.java
+++ b/backend/src/main/java/com/designhub/service/AnalyticsService.java
@@ -2089,6 +2089,8 @@ public class AnalyticsService {
         List<Department> departments = departmentMapper.selectList(null);
         Map<Long, String> deptNames = departments.stream()
             .collect(Collectors.toMap(d -> d.getId(), d -> d.getDeptName(), (a, b) -> a));
+        Map<Long, Long> deptParentIds = departments.stream()
+            .collect(Collectors.toMap(d -> d.getId(), d -> d.getParentId() != null ? d.getParentId() : 0L, (a, b) -> a));
         
         // 🔥 获取每个部门的人数（包含部门负责人）
         Map<Long, Integer> deptMemberCounts = new HashMap<>();
@@ -2110,7 +2112,17 @@ public class AnalyticsService {
             
             DimensionAnalysisVO.ReceivingDeptAnalysis analysis = new DimensionAnalysisVO.ReceivingDeptAnalysis();
             analysis.setDeptId(deptId);
-            analysis.setDeptName(deptNames.getOrDefault(deptId, "未知部门"));
+            
+            // 🔥 如果是子部门且有同名部门，显示为"父部门-子部门"格式
+            String deptName = deptNames.getOrDefault(deptId, "未知部门");
+            Long parentId = deptParentIds.getOrDefault(deptId, 0L);
+            if (parentId != null && parentId > 0) {
+                String parentName = deptNames.get(parentId);
+                if (parentName != null && !parentName.isEmpty()) {
+                    deptName = parentName + "-" + deptName;
+                }
+            }
+            analysis.setDeptName(deptName);
             analysis.setTotalTasks(deptTasks.size());
             
             // 🔥 设置部门人数