fix(hrm): 调岗申请人以员工档案的 user_id 为准（前端可能传员工主键）

tuqin

4 天以前 2dfaaa8a923b33fb58b8789925ba5b7b2df21f3a

 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;
@@ -13,10 +15,12 @@
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.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.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;
@@ -48,7 +52,7 @@
/**
 * 调岗申请 Service 实现类
 *
 * @author 芋道源码
 * @author 超级管理员
 */
@Service
@Validated
@@ -66,6 +70,8 @@
    @Resource
    private AdminUserApi adminUserApi;
    @Resource
    private HrmEmployeeService employeeService;
    @Resource
    private BpmProcessInstanceApi bpmProcessInstanceApi;
    @Resource
    private BpmCategoryService bpmCategoryService;
@@ -77,25 +83,60 @@
    @Override
    @Transactional(rollbackFor = Exception.class)
    public Long createTransferApplication(HrmTransferApplicationSaveReqVO createReqVO) {
        // 1. 校验目标部门与原部门不能相同
        // 1. 解析申请人 & 补全原部门/原岗位
        // 前端表单只让用户选择「被调岗员工」，不直接提交 currentDeptId/currentPostId，
        // 而这两个字段在库里是 NOT NULL，缺省会直接抛 SQL 异常（Field '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) {
            // 约定 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();
        }
        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. 设置申请人信息
        Long userId = createReqVO.getUserId();
        if (userId == null) {
            userId = getCurrentUserId();
        }
        AdminUserRespDTO user = adminUserApi.getUser(userId);
        if (user == null) {
            userId = getCurrentUserId();
        }
        // 5. 插入
        HrmTransferApplicationDO application = BeanUtils.toBean(createReqVO, HrmTransferApplicationDO.class);
        application.setNo(no);
@@ -105,6 +146,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() {
@@ -168,9 +230,14 @@
        }
        HrmTransferApplicationRespVO respVO = BeanUtils.toBean(application, HrmTransferApplicationRespVO.class);
        if (application.getUserId() != null) {
            AdminUserRespDTO user = adminUserApi.getUser(application.getUserId());
            if (user != null) {
                respVO.setUserName(user.getNickname());
            // 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());
            }
        }
        fillDeptNames(respVO, application);
@@ -215,7 +282,14 @@
                .map(HrmTransferApplicationDO::getUserId)
                .filter(Objects::nonNull)
                .collect(Collectors.toSet());
        Map<Long, AdminUserRespDTO> userMap = adminUserApi.getUserMap(userIds);
        // userId 存的是员工ID，按员工表查询姓名
        Map<Long, String> employeeNameMap = new HashMap<>();
        for (Long userId : userIds) {
            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)
@@ -228,8 +302,8 @@
        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 && 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());