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/controller/admin/safety/SafetyOrgController.java | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/SafetyOrgController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/SafetyOrgController.java
index 985bed3..60bbf5a 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/SafetyOrgController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/SafetyOrgController.java
@@ -63,6 +63,14 @@
var org = orgService.getOrg(id);
var resp = new SafetyOrgRespVO();
org2resp(org, resp);
+ // 璐熻矗浜虹敤鍛樺伐妗ｆ鏈�鏂板鍚嶈鐩栧揩鐓�
+ if (org.getLeaderId() != null) {
+ var employee = orgService.getLeader(org.getLeaderId());
+ if (employee != null) {
+ resp.setLeaderName(employee.getName());
+ resp.setLeaderPhone(employee.getPhone());
+ }
+ }
return success(resp);
}
--
Gitblit v1.9.3