From beeac96779eaee7c74fb7564851f9f87b2b19b67 Mon Sep 17 00:00:00 2001
From: tuqin <tuqin@local>
Date: 星期五, 06 十一月 2026 14:40:54 +0800
Subject: [PATCH] fix(hrm): 调岗列表申请人姓名兼容 user_id 双口径(历史数据存员工主键)
---
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/approval/HrmTransferApplicationServiceImpl.java | 34 +++++++++++++++++++++++++++++++---
1 files changed, 31 insertions(+), 3 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 ac11cd5..f7ea50f 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
@@ -93,7 +93,15 @@
employee = employeeService.getEmployee(employeeId);
}
if (employee == null && userId != null) {
+ // 绾﹀畾 user_id 瀛� system_users.id锛涗絾鍘嗗彶涓婂墠绔篃鏈夋妸銆屽憳宸ヤ富閿�嶅杩� userId 鐨勬儏鍐碉紝涓ょ閮藉吋瀹�
employee = employeeService.getEmployeeByUserId(userId);
+ if (employee == null) {
+ employee = employeeService.getEmployee(userId);
+ }
+ }
+ // 浠ュ憳宸ユ。妗堜笂鐨� user_id 涓哄噯锛堝墠绔彲鑳芥妸鍛樺伐涓婚敭濉炲湪 userId 瀛楁閲岋紝鐩存帴鐢ㄤ細鍐欓敊鐢宠浜猴級
+ if (employee != null && employee.getUserId() != null) {
+ userId = employee.getUserId();
}
if (userId == null && employee != null) {
userId = employee.getUserId();
@@ -226,10 +234,16 @@
if (user != null) {
respVO.setUserName(user.getNickname());
}
- // 琛ㄩ噷鍙瓨浜� user_id锛屽墠绔慨鏀规椂闇�瑕佺敤 employeeId 鍥炴樉銆岃璋冨矖鍛樺伐銆嶏紝杩欓噷鎸夌敤鎴峰弽鏌ュ憳宸ユ。妗�
+ // user_id 姝e父瀛� system_users.id锛涘巻鍙叉暟鎹篃鏈夊瓨銆屽憳宸ヤ富閿�嶇殑锛屼袱绉嶉兘鍏煎
HrmEmployeeDO employee = employeeService.getEmployeeByUserId(application.getUserId());
+ if (employee == null) {
+ employee = employeeService.getEmployee(application.getUserId());
+ }
if (employee != null) {
respVO.setEmployeeId(employee.getId());
+ if (user == null) {
+ respVO.setUserName(employee.getName());
+ }
}
}
fillDeptNames(respVO, application);
@@ -275,6 +289,16 @@
.filter(Objects::nonNull)
.collect(Collectors.toSet());
Map<Long, AdminUserRespDTO> userMap = adminUserApi.getUserMap(userIds);
+ // 鍏滃簳锛氬巻鍙叉暟鎹噷 user_id 鍙兘瀛樼殑鏄�屽憳宸ヤ富閿�嶈�屼笉鏄� system_users.id锛屾煡涓嶅埌鐢ㄦ埛鏃舵寜鍛樺伐妗f琛ュ鍚�
+ Map<Long, String> employeeNameMap = new HashMap<>();
+ for (Long userId : userIds) {
+ if (!userMap.containsKey(userId)) {
+ HrmEmployeeDO employee = employeeService.getEmployee(userId);
+ if (employee != null) {
+ employeeNameMap.put(userId, employee.getName());
+ }
+ }
+ }
Set<Long> deptIds = pageResult.getList().stream()
.flatMap(app -> Stream.of(app.getCurrentDeptId(), app.getTargetDeptId()))
.filter(Objects::nonNull)
@@ -287,8 +311,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 && userMap.containsKey(app.getUserId())) {
- vo.setUserName(userMap.get(app.getUserId()).getNickname());
+ 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