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-mes/src/main/java/cn/iocoder/yudao/module/mes/service/safety/SafetyCertificateService.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
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 -> {
--
Gitblit v1.9.3