From 13801ec910e891cbe1fe89e7e3285ded134aad15 Mon Sep 17 00:00:00 2001
From: tuqin <tuqin@local>
Date: 星期五, 06 十一月 2026 14:15:44 +0800
Subject: [PATCH] fix(hrm): 修复新增调岗申请报 500（原部门/原岗位未回填）
---
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/approval/HrmTransferApplicationServiceImpl.java | 81 +++++++++++++++++++++++++++++++++-------
1 files changed, 67 insertions(+), 14 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 3d02148..6a79ec3 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
@@ -2,6 +2,8 @@
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.ObjUtil;
+import cn.hutool.core.util.StrUtil;
+import cn.hutool.json.JSONUtil;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.module.bpm.api.task.BpmProcessInstanceApi;
@@ -15,10 +17,10 @@
import cn.iocoder.yudao.module.hrm.dal.dataobject.approval.HrmTransferApplicationDO;
import cn.iocoder.yudao.module.hrm.dal.dataobject.employee.HrmEmployeeDO;
import cn.iocoder.yudao.module.hrm.dal.mysql.approval.HrmTransferApplicationMapper;
-import cn.iocoder.yudao.module.hrm.service.employee.HrmEmployeeService;
import cn.iocoder.yudao.module.hrm.dal.redis.HrmNoRedisDAO;
import cn.iocoder.yudao.module.hrm.enums.HrmAuditStatusEnum;
import cn.iocoder.yudao.module.hrm.enums.HrmTransferTypeEnum;
+import cn.iocoder.yudao.module.hrm.service.employee.HrmEmployeeService;
import cn.iocoder.yudao.module.system.api.dept.DeptApi;
import cn.iocoder.yudao.module.system.api.dept.PostApi;
import cn.iocoder.yudao.module.system.api.storage.StorageAttachmentApi;
@@ -81,25 +83,52 @@
@Override
@Transactional(rollbackFor = Exception.class)
public Long createTransferApplication(HrmTransferApplicationSaveReqVO createReqVO) {
- // 1. 鏍￠獙鐩爣閮ㄩ棬涓庡師閮ㄩ棬涓嶈兘鐩稿悓
+ // 1. 瑙ｆ瀽鐢宠浜� & 琛ュ叏鍘熼儴闂�/鍘熷矖浣�
+ // 鍓嶇琛ㄥ崟鍙鐢ㄦ埛閫夋嫨銆岃璋冨矖鍛樺伐銆嶏紝涓嶇洿鎺ユ彁浜� currentDeptId/currentPostId锛�
+ // 鑰岃繖涓や釜瀛楁鍦ㄥ簱閲屾槸 NOT NULL锛岀己鐪佷細鐩存帴鎶� SQL 寮傚父锛團ield 'current_dept_id' doesn't have a default value锛�
+ Long userId = createReqVO.getUserId();
+ Long employeeId = createReqVO.getEmployeeId();
+ HrmEmployeeDO employee = null;
+ if (employeeId != null) {
+ employee = employeeService.getEmployee(employeeId);
+ }
+ if (employee == null && userId != null) {
+ employee = employeeService.getEmployeeByUserId(userId);
+ }
+ if (userId == null && employee != null) {
+ userId = employee.getUserId();
+ }
+ if (userId == null) {
+ userId = getCurrentUserId();
+ if (employee == null) {
+ employee = employeeService.getEmployeeByUserId(userId);
+ }
+ }
+ if (adminUserApi.getUser(userId) == null) {
+ userId = getCurrentUserId();
+ }
+ if (createReqVO.getCurrentDeptId() == null && employee != null) {
+ createReqVO.setCurrentDeptId(employee.getDeptId());
+ }
+ if (createReqVO.getCurrentPostId() == null && employee != null) {
+ createReqVO.setCurrentPostId(parseFirstPostId(employee.getPostIds()));
+ }
+ if (createReqVO.getCurrentDeptId() == null) {
+ throw exception(TRANSFER_APPLICATION_CURRENT_DEPT_REQUIRED);
+ }
+ if (createReqVO.getCurrentPostId() == null) {
+ throw exception(TRANSFER_APPLICATION_CURRENT_POST_REQUIRED);
+ }
+ // 2. 鏍￠獙鐩爣閮ㄩ棬涓庡師閮ㄩ棬涓嶈兘鐩稿悓锛堟斁鍦ㄨˉ鍏ㄤ箣鍚庯紝鍚﹀垯琛ュ叏鍑烘潵鐨勫師閮ㄩ棬缁曡繃浜嗘牎楠岋級
if (Objects.equals(createReqVO.getTargetDeptId(), createReqVO.getCurrentDeptId())) {
throw exception(TRANSFER_APPLICATION_SAME_DEPT);
}
- // 2. 鏍￠獙鐩爣宀椾綅涓庡師宀椾綅涓嶈兘鐩稿悓
+ // 3. 鏍￠獙鐩爣宀椾綅涓庡師宀椾綅涓嶈兘鐩稿悓
if (Objects.equals(createReqVO.getTargetPostId(), createReqVO.getCurrentPostId())) {
throw exception(TRANSFER_APPLICATION_SAME_POST);
}
- // 3. 鐢熸垚鐢宠鍗曞彿
+ // 4. 鐢熸垚鐢宠鍗曞彿
String no = generateUniqueNo();
- // 4. 璁剧疆璋冨矖浜猴紙鍛樺伐ID锛夛細涓虹┖鏃跺彇褰撳墠鐧诲綍鐢ㄦ埛瀵瑰簲鐨勫憳宸�
- Long userId = createReqVO.getUserId();
- if (userId == null) {
- HrmEmployeeDO currentEmployee = employeeService.getEmployeeByUserId(getCurrentUserId());
- userId = currentEmployee != null ? currentEmployee.getId() : null;
- }
- if (userId != null && employeeService.getEmployee(userId) == null) {
- throw exception(EMPLOYEE_NOT_EXISTS);
- }
// 5. 鎻掑叆
HrmTransferApplicationDO application = BeanUtils.toBean(createReqVO, HrmTransferApplicationDO.class);
application.setNo(no);
@@ -109,6 +138,27 @@
storageAttachmentApi.bindAttachments("file", "hrm_transfer_application",
application.getId(), createReqVO.getBlobIds());
return application.getId();
+ }
+
+ /**
+ * 鍙栧憳宸ュ矖浣嶅垪琛ㄤ腑鐨勭涓�涓綔涓恒�屽師宀椾綅銆�
+ *
+ * <p>hrm_employee.post_ids 浠� JSON 鏁扮粍瀛楃涓插瓨鍌紝渚嬪 {@code [20,21]}
+ *
+ * @param postIds 宀椾綅缂栧彿 JSON 瀛楃涓�
+ * @return 绗竴涓矖浣嶇紪鍙凤紱瑙ｆ瀽涓嶅嚭鏉ユ椂杩斿洖 {@code null}
+ */
+ private Long parseFirstPostId(String postIds) {
+ if (StrUtil.isBlank(postIds)) {
+ return null;
+ }
+ try {
+ List<Long> ids = JSONUtil.toList(postIds, Long.class);
+ return CollUtil.isEmpty(ids) ? null : ids.get(0);
+ } catch (Exception ex) {
+ log.warn("[parseFirstPostId][postIds({}) 瑙ｆ瀽澶辫触]", postIds, ex);
+ return null;
+ }
}
private Long getCurrentUserId() {
@@ -172,9 +222,12 @@
}
HrmTransferApplicationRespVO respVO = BeanUtils.toBean(application, HrmTransferApplicationRespVO.class);
if (application.getUserId() != null) {
- HrmEmployeeDO employee = employeeService.getEmployee(application.getUserId());
+ // 娉ㄦ剰锛歨rm_transfer_application.user_id 瀛樼殑鏄� system_users.id锛�
+ // 蹇呴』鐢� getEmployeeByUserId 鏌ユ。妗堬紱鐢� getEmployee(userId) 浼氭寜鍛樺伐涓婚敭鏌ワ紝灞炰簬 id 娣风敤
+ HrmEmployeeDO employee = employeeService.getEmployeeByUserId(application.getUserId());
if (employee != null) {
respVO.setUserName(employee.getName());
+ respVO.setEmployeeId(employee.getId());
}
}
fillDeptNames(respVO, application);
--
Gitblit v1.9.3