From 5f612ab2f67b2c6f6894c624a7780799526d566d Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期四, 05 十一月 2026 20:20:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_business_新高电力' into dev_business_新高电力
---
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/remind/HrmExpiryRemindServiceImpl.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/remind/HrmExpiryRemindServiceImpl.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/remind/HrmExpiryRemindServiceImpl.java
index 72923c9..15b981a 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/remind/HrmExpiryRemindServiceImpl.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/remind/HrmExpiryRemindServiceImpl.java
@@ -184,8 +184,10 @@
}
private Map<Long, HrmEmployeeDO> buildEmployeeMap(java.util.Collection<Long> employeeIds) {
+ // 蹇呴』杩斿洖鍙帴鍙� null key 鐨勭┖ Map锛氳皟鐢ㄦ柟浼� employeeMap.get(certificate.getEmployeeId())锛�
+ // 鑰� employeeId 鍏佽涓虹┖锛堣瘉浠�/鍚堝悓鏈粦瀹氬憳宸ワ級锛孧ap.of() 鐨� get(null) 浼氭姏 NPE 瀵艰嚧鍒楄〃鎺ュ彛 500
if (CollUtil.isEmpty(employeeIds)) {
- return Map.of();
+ return new HashMap<>();
}
return employeeService.getEmployeeList(employeeIds).stream()
.collect(java.util.stream.Collectors.toMap(HrmEmployeeDO::getId, e -> e, (a, b) -> a));
--
Gitblit v1.9.3