From 5821949796c829101dac56e7823712975f13f6bc Mon Sep 17 00:00:00 2001
From: tuqin <tuqin@local>
Date: 星期五, 06 十一月 2026 14:46:01 +0800
Subject: [PATCH] fix(hrm): 调岗列表申请人姓名兼容 user_id 双口径（历史数据存员工主键）
---
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/approval/HrmTransferApplicationServiceImpl.java | 19 +++++++++++++------
1 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/approval/HrmTransferApplicationServiceImpl.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/approval/HrmTransferApplicationServiceImpl.java
index 3671410..ee0c1f7 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/approval/HrmTransferApplicationServiceImpl.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/approval/HrmTransferApplicationServiceImpl.java
@@ -282,12 +282,15 @@
.map(HrmTransferApplicationDO::getUserId)
.filter(Objects::nonNull)
.collect(Collectors.toSet());
- // userId 瀛樼殑鏄憳宸D锛屾寜鍛樺伐琛ㄦ煡璇㈠鍚�
+ // user_id 姝ｅ父瀛� system_users.id锛涘巻鍙叉暟鎹篃鏈夊瓨銆屽憳宸ヤ富閿�嶇殑锛屼袱绉嶉兘鍏煎
+ Map<Long, AdminUserRespDTO> userMap = adminUserApi.getUserMap(userIds);
Map<Long, String> employeeNameMap = new HashMap<>();
for (Long userId : userIds) {
- HrmEmployeeDO employee = employeeService.getEmployee(userId);
- if (employee != null) {
- employeeNameMap.put(userId, employee.getName());
+ if (!userMap.containsKey(userId)) {
+ HrmEmployeeDO employee = employeeService.getEmployee(userId);
+ if (employee != null) {
+ employeeNameMap.put(userId, employee.getName());
+ }
}
}
Set<Long> deptIds = pageResult.getList().stream()
@@ -302,8 +305,12 @@
Map<Long, PostRespDTO> postMap = postApi.getPostMap(postIds);
List<HrmTransferApplicationRespVO> list = pageResult.getList().stream().map(app -> {
HrmTransferApplicationRespVO vo = BeanUtils.toBean(app, HrmTransferApplicationRespVO.class);
- if (app.getUserId() != null && employeeNameMap.containsKey(app.getUserId())) {
- vo.setUserName(employeeNameMap.get(app.getUserId()));
+ if (app.getUserId() != null) {
+ if (userMap.containsKey(app.getUserId())) {
+ vo.setUserName(userMap.get(app.getUserId()).getNickname());
+ } else if (employeeNameMap.containsKey(app.getUserId())) {
+ vo.setUserName(employeeNameMap.get(app.getUserId()));
+ }
}
if (app.getCurrentDeptId() != null && deptMap.containsKey(app.getCurrentDeptId())) {
vo.setCurrentDeptName(deptMap.get(app.getCurrentDeptId()).getName());
--
Gitblit v1.9.3