From 061cac2d75b9abe60cd29a5e9abae0e8e630739f Mon Sep 17 00:00:00 2001
From: tuqin <tuqin@local>
Date: 星期五, 06 十一月 2026 15:46:10 +0800
Subject: [PATCH] fix(hrm): 调岗提交不再强制要求 processDefinitionKey，并在审批通过后自动同步员工档案
---
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/approval/HrmTransferApplicationServiceImpl.java | 82 +++++++++++++++++++++++++++++++++++++---
1 files changed, 75 insertions(+), 7 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..b5b1c74 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
@@ -14,6 +14,7 @@
import cn.iocoder.yudao.module.hrm.controller.admin.approval.vo.HrmTransferApplicationPageReqVO;
import cn.iocoder.yudao.module.hrm.controller.admin.approval.vo.HrmTransferApplicationRespVO;
import cn.iocoder.yudao.module.hrm.controller.admin.approval.vo.HrmTransferApplicationSaveReqVO;
+import cn.iocoder.yudao.module.hrm.controller.admin.employee.vo.HrmEmployeeSaveReqVO;
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;
@@ -37,6 +38,7 @@
import java.util.ArrayList;
import java.util.Collections;
+import java.util.Comparator;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -282,12 +284,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 +307,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());
@@ -332,17 +341,40 @@
throw exception(TRANSFER_APPLICATION_SUBMIT_FAIL_NOT_DRAFT);
}
validateApproveCategoryAndProcessDefinition();
+ // 鍓嶇涓嶄紶娴佺▼瀹氫箟 Key 鏃讹紝鑷姩鍙栬瀹℃壒鍒嗙被涓嬫渶鏂扮増鏈殑娲昏穬娴佺▼锛�
+ // 閬垮厤鐩存帴鎶� MissingServletRequestParameterException 鎶涚粰鐢ㄦ埛
+ if (StrUtil.isBlank(processDefinitionKey)) {
+ processDefinitionKey = resolveActiveProcessDefinitionKey();
+ }
ProcessDefinition processDefinition = bpmProcessDefinitionService.getActiveProcessDefinition(processDefinitionKey);
if (processDefinition == null) {
throw exception(TRANSFER_APPLICATION_BPM_PROCESS_DEFINITION_NOT_EXISTS);
}
String processInstanceId = bpmProcessInstanceApi.createProcessInstance(userId, new BpmProcessInstanceCreateReqDTO()
- .setProcessDefinitionKey(processDefinitionKey).setBusinessKey(String.valueOf(id)));
+ .setProcessDefinitionKey(processDefinition.getKey()).setBusinessKey(String.valueOf(id)));
transferApplicationMapper.updateById(HrmTransferApplicationDO.builder()
.id(id)
.processInstanceId(processInstanceId)
.status(HrmAuditStatusEnum.PROCESS.getStatus())
.build());
+ }
+
+ /**
+ * 鍙栬皟宀楀鎵瑰垎绫讳笅鏈�鏂扮増鏈殑娲昏穬娴佺▼瀹氫箟 Key
+ */
+ private String resolveActiveProcessDefinitionKey() {
+ List<BpmProcessDefinitionInfoDO> definitionInfoList = bpmProcessDefinitionService
+ .getProcessDefinitionInfoListByCategory(APPROVE_CATEGORY_CODE);
+ if (CollUtil.isEmpty(definitionInfoList)) {
+ throw exception(TRANSFER_APPLICATION_BPM_PROCESS_DEFINITION_NOT_EXISTS);
+ }
+ Set<String> processDefinitionIds = convertSet(definitionInfoList, BpmProcessDefinitionInfoDO::getProcessDefinitionId);
+ List<ProcessDefinition> processDefinitions = bpmProcessDefinitionService.getProcessDefinitionList(processDefinitionIds);
+ return processDefinitions.stream()
+ .filter(pd -> !pd.isSuspended())
+ .max(Comparator.comparingInt(ProcessDefinition::getVersion))
+ .map(ProcessDefinition::getKey)
+ .orElseThrow(() -> exception(TRANSFER_APPLICATION_BPM_PROCESS_DEFINITION_NOT_EXISTS));
}
private void validateApproveCategoryAndProcessDefinition() {
@@ -403,6 +435,42 @@
.status(status)
.approveTime(java.time.LocalDateTime.now())
.build());
+ // 瀹℃壒閫氳繃锛氭妸鍛樺伐妗ｆ閲岀殑閮ㄩ棬/宀椾綅鍚屾鎴愯皟宀楀悗鐨勭洰鏍囧��
+ if (HrmAuditStatusEnum.APPROVE.getStatus().equals(status)) {
+ syncEmployeePosition(application);
+ }
+ }
+
+ /**
+ * 璋冨矖瀹℃壒閫氳繃鍚庯紝鎶婂憳宸ユ。妗堢殑閮ㄩ棬/宀椾綅鏇存柊涓虹洰鏍囬儴闂�/宀椾綅
+ *
+ * <p>璧� {@link HrmEmployeeService#updateEmployee} 鑰屼笉鏄洿鎺ユ敼琛紝
+ * 杩欐牱 system_users 涓婄殑閮ㄩ棬/宀椾綅鍏宠仈涔熶細涓�骞跺悓姝ワ紝鍛樺伐绠＄悊鍒楄〃鑳界珛鍒荤湅鍒版柊宀椾綅銆�
+ */
+ private void syncEmployeePosition(HrmTransferApplicationDO application) {
+ if (application.getTargetDeptId() == null || application.getTargetPostId() == null) {
+ return;
+ }
+ try {
+ HrmEmployeeDO employee = employeeService.getEmployeeByUserId(application.getUserId());
+ if (employee == null) {
+ employee = employeeService.getEmployee(application.getUserId());
+ }
+ if (employee == null) {
+ log.warn("[syncEmployeePosition][璋冨矖鐢宠({}) 鎵句笉鍒板憳宸ユ。妗堬紝璺宠繃妗ｆ鍚屾]", application.getId());
+ return;
+ }
+ HrmEmployeeSaveReqVO updateReqVO = BeanUtils.toBean(employee, HrmEmployeeSaveReqVO.class);
+ updateReqVO.setDeptId(application.getTargetDeptId());
+ // 璋冨矖鎸夊崟宀椾綅澶勭悊锛岀洿鎺ヨ惤鐩爣宀椾綅
+ updateReqVO.setPostIds(Collections.singletonList(application.getTargetPostId()));
+ employeeService.updateEmployee(updateReqVO);
+ log.info("[syncEmployeePosition][璋冨矖鐢宠({}) 宸插皢鍛樺伐({}) 閮ㄩ棬鏀逛负 {}銆佸矖浣嶆敼涓� {}]",
+ application.getId(), employee.getName(), application.getTargetDeptId(), application.getTargetPostId());
+ } catch (Exception ex) {
+ // 妗ｆ鍚屾澶辫触锛堜緥濡傜洰鏍囬儴闂�/宀椾綅宸茶鍒犻櫎锛変笉搴旇闃绘柇瀹℃壒鐘舵�佽惤搴擄紝鍙褰曟棩蹇�
+ log.error("[syncEmployeePosition][璋冨矖鐢宠({}) 鍚屾鍛樺伐妗ｆ澶辫触]", application.getId(), ex);
+ }
}
@Override
--
Gitblit v1.9.3