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-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/logger/OperateLogController.java | 5 +
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/SafetyRefResolver.java | 13 +++-
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/api/employee/HrmEmployeeApiImpl.java | 5 +
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/SafetyCertificateService.java | 6 +
yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/safety/SafetyRefResolverEmptyCollectionTest.java | 105 +++++++++++++++++++++++++++++++++++
5 files changed, 127 insertions(+), 7 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());
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/SafetyCertificateService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/SafetyCertificateService.java
index b40ca58..4c4ca18 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/SafetyCertificateService.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/SafetyCertificateService.java
@@ -19,6 +19,7 @@
import java.time.LocalDate;
import java.time.temporal.ChronoUnit;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
@@ -101,7 +102,10 @@
List<Long> employeeIds = certs.stream()
.map(SafetyCertificateDO::getEmployeeId)
.filter(Objects::nonNull).distinct().toList();
- Map<Long, HrmEmployeeSimpleDTO> employeeMap = employeeIds.isEmpty() ? Map.of()
+ // 鐢� new HashMap<>() 鑰岄潪 Map.of()锛歟mployeeId 鍏佽涓� null锛�
+ // 鍚庨潰 employeeMap.get(cert.getEmployeeId()) 鍦ㄧ┖闆嗗悎鍦烘櫙浼� get(null)锛�
+ // Map.of() 鐨� get(null) 浼氭姏 NPE 瀵艰嚧璇佷欢鍒楄〃鎺ュ彛 500銆�
+ Map<Long, HrmEmployeeSimpleDTO> employeeMap = employeeIds.isEmpty() ? new HashMap<>()
: hrmEmployeeApi.getEmployeeList(employeeIds).stream()
.collect(Collectors.toMap(HrmEmployeeSimpleDTO::getId, e -> e, (a, b) -> a));
certs.forEach(cert -> {
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/SafetyRefResolver.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/SafetyRefResolver.java
index 6350614..702a2ff 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/SafetyRefResolver.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/SafetyRefResolver.java
@@ -9,6 +9,7 @@
import org.springframework.stereotype.Component;
import java.util.Collection;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
@@ -65,12 +66,15 @@
* 鎵归噺鍙栧憳宸ワ紝杩斿洖 id -> 鍛樺伐 鐨� Map
*/
public Map<Long, HrmEmployeeSimpleDTO> employeeMap(Collection<Long> employeeIds) {
+ // 娉ㄦ剰锛氳繖閲屽繀椤昏繑鍥炲彲鎺ュ彈 null key 鐨勭┖ Map銆�
+ // 璋冪敤鏂逛細鐩存帴 map.get(璁板綍閲岀殑 xxxId)锛岃�� xxxId 鍏佽涓� null锛堜緥濡傜粍缁囨湭璁捐礋璐d汉銆�
+ // 璇佷欢鏈叧鑱旀寔璇佷汉锛夛紝Map.of() 鐨� get(null) 浼氭姏 NPE锛屽鑷村垪琛ㄦ帴鍙� 500銆�
if (CollUtil.isEmpty(employeeIds)) {
- return Map.of();
+ return new HashMap<>();
}
List<Long> ids = employeeIds.stream().filter(Objects::nonNull).distinct().toList();
if (ids.isEmpty()) {
- return Map.of();
+ return new HashMap<>();
}
return hrmEmployeeApi.getEmployeeList(ids).stream()
.collect(Collectors.toMap(HrmEmployeeSimpleDTO::getId, e -> e, (a, b) -> a));
@@ -103,12 +107,13 @@
* 鎵归噺鍙栬溅闂达紝杩斿洖 id -> 杞﹂棿 鐨� Map
*/
public Map<Long, MesMdWorkshopDO> workshopMap(Collection<Long> workshopIds) {
+ // 鍚屼笂锛氳溅闂寸紪鍙峰厑璁镐负 null锛岀┖闆嗗悎蹇呴』杩斿洖鍙帴鍙� null key 鐨� Map
if (CollUtil.isEmpty(workshopIds)) {
- return Map.of();
+ return new HashMap<>();
}
List<Long> ids = workshopIds.stream().filter(Objects::nonNull).distinct().toList();
if (ids.isEmpty()) {
- return Map.of();
+ return new HashMap<>();
}
return workshopMapper.selectBatchIds(ids).stream()
.collect(Collectors.toMap(MesMdWorkshopDO::getId, w -> w, (a, b) -> a));
diff --git a/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/safety/SafetyRefResolverEmptyCollectionTest.java b/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/safety/SafetyRefResolverEmptyCollectionTest.java
new file mode 100644
index 0000000..cd8a3ee
--- /dev/null
+++ b/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/safety/SafetyRefResolverEmptyCollectionTest.java
@@ -0,0 +1,105 @@
+package cn.iocoder.yudao.module.mes.service.safety;
+
+import cn.iocoder.yudao.module.hrm.api.employee.HrmEmployeeApi;
+import cn.iocoder.yudao.module.hrm.api.employee.dto.HrmEmployeeSimpleDTO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.md.workstation.MesMdWorkshopDO;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
+
+import java.util.List;
+import java.util.Map;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+/**
+ * {@link SafetyRefResolver} 绌洪泦鍚堝満鏅洖褰掓祴璇�
+ *
+ * <p>鑳屾櫙锛歿@code Map.of()} 鏄┖涓斾笉鍙彉鐨� Map锛屽畠鐨� {@code get(null)} 浼氭姏 NPE锛�
+ * 鑰� {@code Map.of().get(闈瀗ull)} 涓嶄細銆傚畨鍏ㄧ敓浜фā鍧楅噷銆岀粍缁� / 璇佷欢 / 闅愭偅銆嶇瓑
+ * 璁板綍鍦ㄦ湭鍏宠仈鍛樺伐锛坙eaderId銆乪mployeeId 涓� null锛夋椂锛屽氨浼氳蛋鍒� {@code map.get(null)}锛�
+ * 浠庤�屽湪鍒楄〃椤电洿鎺� 500銆�</p>
+ *
+ * <p>杩欓噷閿佹绾﹀畾锛氱┖闆嗗悎蹇呴』杩斿洖鍙帴鍙� null key 鐨勭┖ Map銆�</p>
+ */
+@ExtendWith(MockitoExtension.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
+class SafetyRefResolverEmptyCollectionTest {
+
+ @InjectMocks
+ private SafetyRefResolver resolver;
+
+ @Mock
+ private HrmEmployeeApi hrmEmployeeApi;
+ @Mock
+ private cn.iocoder.yudao.module.mes.dal.mysql.md.workstation.MesMdWorkshopMapper workshopMapper;
+
+ /** 绌洪泦鍚堬細蹇呴』鑳� get(null) 鑰屼笉鎶� NPE锛堣繖灏辨槸绾夸笂 NPE 鐨勬牴鍥狅級 */
+ @Test
+ void employeeMap_emptyCollection_getNullShouldNotThrow() {
+ Map<Long, HrmEmployeeSimpleDTO> map = resolver.employeeMap(List.of());
+ assertTrue(map.isEmpty());
+ // Map.of() 鍦ㄨ繖閲屼細鎶� NullPointerException
+ assertNull(map.get(null), "绌洪泦鍚堣繑鍥炵殑 Map 蹇呴』鍏佽鐢� null 浣滀负 key 鏌ヨ");
+ }
+
+ /** 闆嗗悎閲屽叏鏄� null锛氳繃婊ゅ悗涓虹┖锛屽悓鏍峰繀椤昏兘 get(null) */
+ @Test
+ void employeeMap_allNullElements_getNullShouldNotThrow() {
+ Map<Long, HrmEmployeeSimpleDTO> map = resolver.employeeMap(java.util.Arrays.asList((Long) null, null));
+ assertTrue(map.isEmpty());
+ assertNull(map.get(null));
+ }
+
+ /** null 闆嗗悎鏈韩 */
+ @Test
+ void employeeMap_nullCollection_getNullShouldNotThrow() {
+ Map<Long, HrmEmployeeSimpleDTO> map = resolver.employeeMap(null);
+ assertTrue(map.isEmpty());
+ assertNull(map.get(null));
+ }
+
+ @Test
+ void workshopMap_emptyCollection_getNullShouldNotThrow() {
+ Map<Long, MesMdWorkshopDO> map = resolver.workshopMap(List.of());
+ assertTrue(map.isEmpty());
+ assertNull(map.get(null), "绌洪泦鍚堣繑鍥炵殑 Map 蹇呴』鍏佽鐢� null 浣滀负 key 鏌ヨ");
+ }
+
+ @Test
+ void workshopMap_allNullElements_getNullShouldNotThrow() {
+ Map<Long, MesMdWorkshopDO> map = resolver.workshopMap(java.util.Arrays.asList((Long) null));
+ assertTrue(map.isEmpty());
+ assertNull(map.get(null));
+ }
+
+ @Test
+ void workshopMap_nullCollection_getNullShouldNotThrow() {
+ Map<Long, MesMdWorkshopDO> map = resolver.workshopMap(null);
+ assertTrue(map.isEmpty());
+ assertNull(map.get(null));
+ }
+
+ /** 杩斿洖鐨� Map 搴旇鏄彲鍙樼殑锛堥伩鍏嶅悗缁� put 鎶� UnsupportedOperationException锛� */
+ @Test
+ void employeeMap_emptyResultShouldBeMutable() {
+ Map<Long, HrmEmployeeSimpleDTO> map = resolver.employeeMap(List.of());
+ map.put(1L, new HrmEmployeeSimpleDTO());
+ assertEquals(1, map.size());
+ }
+
+ @Test
+ void workshopMap_emptyResultShouldBeMutable() {
+ Map<Long, MesMdWorkshopDO> map = resolver.workshopMap(List.of());
+ map.put(1L, new MesMdWorkshopDO());
+ assertEquals(1, map.size());
+ }
+
+}
diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/logger/OperateLogController.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/logger/OperateLogController.java
index 827c806..e4698e4 100644
--- a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/logger/OperateLogController.java
+++ b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/logger/OperateLogController.java
@@ -28,6 +28,7 @@
import org.springframework.web.bind.annotation.RestController;
import java.io.IOException;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -86,7 +87,9 @@
Set<Long> userIds = responses.stream()
.filter(log -> Objects.equals(log.getUserType(), UserTypeEnum.ADMIN.getValue()))
.map(OperateLogRespVO::getUserId).filter(Objects::nonNull).collect(Collectors.toSet());
- Map<Long, AdminUserDO> users = userIds.isEmpty() ? Map.of() : adminUserService.getUserMap(userIds);
+ // 鐢� new HashMap<>() 鑰岄潪 Map.of()锛氫笅闈細鎸� log.getUserId() 鍙栧�硷紝
+ // 闈炵鐞嗗憳鍒嗘敮铏界劧宸插垽绌猴紝浣嗕繚鎸佷竴鑷寸殑鍐欐硶鍙伩鍏嶄互鍚庢敼鍔ㄨ俯鍒� Map.of() 鐨� get(null) NPE銆�
+ Map<Long, AdminUserDO> users = userIds.isEmpty() ? new HashMap<>() : adminUserService.getUserMap(userIds);
for (OperateLogRespVO log : responses) {
if (log.getUserId() == null) {
log.setUserName("鏈煡鎿嶄綔浜�");
--
Gitblit v1.9.3