From 8fc1b2352f0a7cc6448444c13019cf1323e7f1c2 Mon Sep 17 00:00:00 2001
From: tuqin <tuqin@local>
Date: 星期五, 06 十一月 2026 14:38:58 +0800
Subject: [PATCH] fix(hrm): 调岗申请人以员工档案的 user_id 为准(前端可能传员工主键)
---
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/approval/HrmTransferApplicationServiceImpl.java | 16 +++++++++++++++-
1 files changed, 15 insertions(+), 1 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..3f17d94 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);
--
Gitblit v1.9.3