From 1b5b8ee196c7dcf62b01df7a1e3be053e9a3c77e Mon Sep 17 00:00:00 2001
From: tuqin <tuqin@local>
Date: 星期五, 06 十一月 2026 14:17:22 +0800
Subject: [PATCH] fix(hrm): 调岗申请人/员工档案查询兼容 user_id 双口径
---
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/approval/HrmTransferApplicationServiceImpl.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 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 6a79ec3..f89653b 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,11 @@
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);
+ }
}
if (userId == null && employee != null) {
userId = employee.getUserId();
@@ -222,9 +226,11 @@
}
HrmTransferApplicationRespVO respVO = BeanUtils.toBean(application, HrmTransferApplicationRespVO.class);
if (application.getUserId() != null) {
- // 娉ㄦ剰锛歨rm_transfer_application.user_id 瀛樼殑鏄� system_users.id锛�
- // 蹇呴』鐢� getEmployeeByUserId 鏌ユ。妗堬紱鐢� getEmployee(userId) 浼氭寜鍛樺伐涓婚敭鏌ワ紝灞炰簬 id 娣风敤
+ // user_id 姝ｅ父瀛� system_users.id锛涘巻鍙叉暟鎹篃鏈夊瓨銆屽憳宸ヤ富閿�嶇殑锛屼袱绉嶉兘鍏煎
HrmEmployeeDO employee = employeeService.getEmployeeByUserId(application.getUserId());
+ if (employee == null) {
+ employee = employeeService.getEmployee(application.getUserId());
+ }
if (employee != null) {
respVO.setUserName(employee.getName());
respVO.setEmployeeId(employee.getId());
--
Gitblit v1.9.3