feat(system): 优化用户搜索功能并完善ERP和MES模块验证逻辑

云

2026-10-25 d54fbc9d4f8981fa0f7f613b33a28a8cd4f764ea

 yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/approval/HrmLeaveApplicationServiceImpl.java

@@ -12,6 +12,9 @@
import cn.iocoder.yudao.module.hrm.dal.redis.HrmNoRedisDAO;
import cn.iocoder.yudao.module.hrm.enums.HrmAuditStatusEnum;
import cn.iocoder.yudao.module.hrm.enums.HrmLeaveTypeEnum;
import cn.iocoder.yudao.module.bpm.api.task.BpmProcessInstanceApi;
import cn.iocoder.yudao.module.bpm.api.task.dto.BpmProcessInstanceCreateReqDTO;
import cn.iocoder.yudao.module.bpm.enums.task.BpmTaskStatusEnum;
import cn.iocoder.yudao.module.system.api.approval.ApprovalConfigApi;
import cn.iocoder.yudao.module.system.api.dept.DeptApi;
import cn.iocoder.yudao.module.system.api.dept.dto.DeptRespDTO;
@@ -52,6 +55,11 @@
     */
    private static final String LEAVE_APPROVE_BIZ_TYPE = "hrm_leave_approve";

    /**
     * 请假申请审批的 BPM 流程定义 Key
     */
    private static final String LEAVE_APPROVE_PROCESS_KEY = "hrm_leave_approve";

    @Resource
    private HrmLeaveApplicationMapper leaveApplicationMapper;
    @Resource
@@ -64,6 +72,8 @@
    private StorageAttachmentApi storageAttachmentApi;
    @Resource
    private ApprovalConfigApi approvalConfigApi;
    @Resource
    private BpmProcessInstanceApi bpmProcessInstanceApi;

    @Override
    @Transactional(rollbackFor = Exception.class)
@@ -77,7 +87,7 @@
        }
        AdminUserRespDTO user = adminUserApi.getUser(userId);
        if (user == null) {
            userId = getCurrentUserId();
            throw exception(LEAVE_APPLICATION_APPLICANT_NOT_EXISTS);
        }
        // 3. 插入
        HrmLeaveApplicationDO application = BeanUtils.toBean(createReqVO, HrmLeaveApplicationDO.class);
@@ -108,9 +118,9 @@
    public void updateLeaveApplication(HrmLeaveApplicationSaveReqVO updateReqVO) {
        // 校验存在
        HrmLeaveApplicationDO application = validateLeaveApplicationExists(updateReqVO.getId());
        // 校验状态为草稿或审批中
        // 校验状态为草稿或审核不通过（审批中禁止修改）
        if (!Objects.equals(application.getStatus(), HrmAuditStatusEnum.DRAFT.getStatus())
                && !Objects.equals(application.getStatus(), HrmAuditStatusEnum.PROCESS.getStatus())) {
                && !Objects.equals(application.getStatus(), HrmAuditStatusEnum.REJECT.getStatus())) {
            throw exception(LEAVE_APPLICATION_UPDATE_FAIL_NOT_DRAFT);
        }
        // 更新
@@ -222,7 +232,15 @@
        approvalConfigApi.validateApprovalEnabledAndGetApprovers(LEAVE_APPROVE_BIZ_TYPE);

        // 3. 状态置为审批中，并清空上一轮审核结果，避免残留「审核不通过」的原因
        leaveApplicationMapper.submitAndResetAuditInfo(id, HrmAuditStatusEnum.PROCESS.getStatus());
        if (leaveApplicationMapper.submitAndResetAuditInfo(id, HrmAuditStatusEnum.PROCESS.getStatus()) != 1) {
            throw exception(LEAVE_APPLICATION_SUBMIT_FAIL_NOT_EDITABLE);
        }

        // 4. 创建 BPM 流程实例，使审批出现在「协同办公 - 我的流程」
        bpmProcessInstanceApi.createProcessInstance(getLoginUserId(),
                new BpmProcessInstanceCreateReqDTO()
                        .setProcessDefinitionKey(LEAVE_APPROVE_PROCESS_KEY)
                        .setBusinessKey(String.valueOf(id)));
    }

    @Override
@@ -247,13 +265,36 @@
            if (StrUtil.isBlank(reviewRemark)) {
                throw exception(LEAVE_APPLICATION_AUDIT_REJECT_REASON_REQUIRED);
            }
            leaveApplicationMapper.auditLeaveApplication(id, HrmAuditStatusEnum.REJECT.getStatus(),
                    userId, getUserNickname(userId), reviewRemark);
            if (leaveApplicationMapper.auditLeaveApplication(id, HrmAuditStatusEnum.REJECT.getStatus(),
                    userId, getUserNickname(userId), reviewRemark) != 1) {
                throw exception(LEAVE_APPLICATION_AUDIT_FAIL_NOT_PROCESS);
            }
            return;
        }
        // 5. 审核通过：记录审核人与审核意见，状态置为审核通过
        leaveApplicationMapper.auditLeaveApplication(id, HrmAuditStatusEnum.APPROVE.getStatus(),
                userId, getUserNickname(userId), reviewRemark);
        if (leaveApplicationMapper.auditLeaveApplication(id, HrmAuditStatusEnum.APPROVE.getStatus(),
                userId, getUserNickname(userId), reviewRemark) != 1) {
            throw exception(LEAVE_APPLICATION_AUDIT_FAIL_NOT_PROCESS);
        }
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public void updateLeaveApplicationAuditStatus(Long id, Integer bpmStatus, String reason) {
        // BPM 审批结果映射为请假审批状态：通过=20 / 不通过=30 / 取消=40
        Integer status;
        if (BpmTaskStatusEnum.APPROVE.getStatus().equals(bpmStatus)) {
            status = HrmAuditStatusEnum.APPROVE.getStatus();
        } else if (BpmTaskStatusEnum.REJECT.getStatus().equals(bpmStatus)) {
            status = HrmAuditStatusEnum.REJECT.getStatus();
        } else if (BpmTaskStatusEnum.CANCEL.getStatus().equals(bpmStatus)) {
            status = HrmAuditStatusEnum.CANCEL.getStatus();
        } else {
            return;
        }
        if (leaveApplicationMapper.updateAuditStatusByBpm(id, status, reason) != 1) {
            log.warn("[updateLeaveApplicationAuditStatus] 请假申请({}) 不处于审批中状态，忽略 BPM 结果({})", id, bpmStatus);
        }
    }

    /**