From e3c16c62021c97e88c7a9d51aee5b1bb63653430 Mon Sep 17 00:00:00 2001
From: tuqin <tuqin@local>
Date: 星期一, 09 十一月 2026 10:00:51 +0800
Subject: [PATCH] feat(hrm): 调岗/离职支持指定申请人,提交免传流程Key,审批通过自动同步员工档案

---
 yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/approval/HrmTransferApplicationServiceImpl.java |   96 ++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 92 insertions(+), 4 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..fd35910 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;
@@ -93,7 +95,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 +236,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 +291,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 +313,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());
@@ -317,12 +347,16 @@
             throw exception(TRANSFER_APPLICATION_SUBMIT_FAIL_NOT_DRAFT);
         }
         validateApproveCategoryAndProcessDefinition();
+        // 鍓嶇涓嶄紶娴佺▼瀹氫箟 Key 鏃讹紝鑷姩鍙栬瀹℃壒鍒嗙被涓嬫渶鏂扮増鏈殑娲昏穬娴佺▼锛岄伩鍏嶃�岃姹傚弬鏁扮己澶�:processDefinitionKey銆�
+        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)
@@ -388,6 +422,60 @@
                 .status(status)
                 .approveTime(java.time.LocalDateTime.now())
                 .build());
+        // 瀹℃壒閫氳繃锛氭妸鍛樺伐妗f閲岀殑閮ㄩ棬/宀椾綅鍚屾鎴愯皟宀楀悗鐨勭洰鏍囧��
+        if (HrmAuditStatusEnum.APPROVE.getStatus().equals(status)) {
+            syncEmployeePosition(application);
+        }
+    }
+
+    /**
+     * 鍙栬皟宀楀鎵瑰垎绫讳笅鏈�鏂扮増鏈殑娲昏穬娴佺▼瀹氫箟 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));
+    }
+
+    /**
+     * 璋冨矖瀹℃壒閫氳繃鍚庯紝鎶婂憳宸ユ。妗堢殑閮ㄩ棬/宀椾綅鏇存柊涓虹洰鏍囬儴闂�/宀椾綅
+     *
+     * <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][璋冨矖鐢宠({}) 鎵句笉鍒板憳宸ユ。妗堬紝璺宠繃妗f鍚屾]", 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) {
+            // 妗f鍚屾澶辫触锛堜緥濡傜洰鏍囬儴闂�/宀椾綅宸茶鍒犻櫎锛変笉搴旇闃绘柇瀹℃壒鐘舵�佽惤搴擄紝鍙褰曟棩蹇�
+            log.error("[syncEmployeePosition][璋冨矖鐢宠({}) 鍚屾鍛樺伐妗f澶辫触]", application.getId(), ex);
+        }
     }
 
     @Override

--
Gitblit v1.9.3