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 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
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