From 2b161b1f1401c89fa927e390d78ff49568337f6c Mon Sep 17 00:00:00 2001
From: xiaoyi <908147524@qq.com>
Date: 星期二, 03 十一月 2026 11:27:03 +0800
Subject: [PATCH] fix: 修复 Map.of() 空集合导致的 NPE(组织/证件等未关联员工时接口 500)

---
 yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/api/employee/HrmEmployeeApiImpl.java |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/api/employee/HrmEmployeeApiImpl.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/api/employee/HrmEmployeeApiImpl.java
index 26a84e4..8528486 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/api/employee/HrmEmployeeApiImpl.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/api/employee/HrmEmployeeApiImpl.java
@@ -10,6 +10,7 @@
 import org.springframework.stereotype.Service;
 
 import java.util.Collection;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
@@ -51,7 +52,9 @@
         // 鎵归噺鏌ラ儴闂紝閬垮厤 N+1
         List<Long> deptIds = employees.stream().map(HrmEmployeeDO::getDeptId)
                 .filter(Objects::nonNull).distinct().toList();
-        Map<Long, DeptRespDTO> deptMap = deptIds.isEmpty() ? Map.of() : deptApi.getDeptMap(deptIds);
+        // 鐢� new HashMap<>() 鑰岄潪 Map.of()锛氬憳宸ョ殑 deptId 鍏佽涓虹┖锛�
+        // 鍚庨潰 deptMap.get(e.getDeptId()) 浼� get(null)锛孧ap.of() 鐨� get(null) 鎶� NPE銆�
+        Map<Long, DeptRespDTO> deptMap = deptIds.isEmpty() ? new HashMap<>() : deptApi.getDeptMap(deptIds);
         return employees.stream()
                 .map(e -> {
                     DeptRespDTO dept = deptMap.get(e.getDeptId());

--
Gitblit v1.9.3