fix(hrm): 补齐请假/离职/调岗的撤销接口，修复点击撤销报 404

xiaoyi

2026-10-30 8b4105c2d327e09ce2664bbd7cf96559be2f788b

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

@@ -7,9 +7,11 @@
import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils;
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.controller.admin.task.vo.instance.BpmProcessInstanceCancelReqVO;
import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmProcessDefinitionInfoDO;
import cn.iocoder.yudao.module.bpm.service.definition.BpmCategoryService;
import cn.iocoder.yudao.module.bpm.service.definition.BpmProcessDefinitionService;
import cn.iocoder.yudao.module.bpm.service.task.BpmProcessInstanceService;
import cn.iocoder.yudao.module.hrm.controller.admin.approval.vo.HrmLeaveApplicationPageReqVO;
import cn.iocoder.yudao.module.hrm.controller.admin.approval.vo.HrmLeaveApplicationRespVO;
import cn.iocoder.yudao.module.hrm.controller.admin.approval.vo.HrmLeaveApplicationSaveReqVO;
@@ -46,7 +48,7 @@
/**
 * 请假申请 Service 实现类
 *
 * @author 芋道源码
 * @author 超级管理员
 */
@Service
@Validated
@@ -69,6 +71,8 @@
    private StorageAttachmentApi storageAttachmentApi;
    @Resource
    private BpmProcessDefinitionService bpmProcessDefinitionService;
    @Resource
    private BpmProcessInstanceService bpmProcessInstanceService;

    @Override
    @Transactional(rollbackFor = Exception.class)
@@ -223,6 +227,17 @@
        }

        // 2. 校验分类和流程定义是否存在
        // 全局免审批：业务校验通过后直接执行审批通过逻辑，无需流程模型。
        if (bpmProcessInstanceApi.isGlobalAutoApprove()) {
            leaveApplicationMapper.updateById(HrmLeaveApplicationDO.builder()
                    .id(id)
                    .processInstanceId("")
                    .status(HrmAuditStatusEnum.PROCESS.getStatus())
                    .build());
            updateLeaveApplicationAuditStatus(id, HrmAuditStatusEnum.APPROVE.getStatus());
            return;
        }

        validateApproveCategoryAndProcessDefinition();

        // 3. 校验传入的流程定义 Key 是否属于该分类且处于激活状态
@@ -272,6 +287,21 @@
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public void cancel(Long id, Long loginUserId) {
        HrmLeaveApplicationDO application = validateLeaveApplicationExists(id);
        // 仅本人、且处于审批中状态可撤销
        if (!Objects.equals(application.getUserId(), loginUserId)
                || !Objects.equals(application.getStatus(), HrmAuditStatusEnum.PROCESS.getStatus())) {
            throw exception(LEAVE_APPLICATION_UPDATE_AUDIT_STATUS_FAIL_NOT_PROCESS);
        }
        bpmProcessInstanceService.cancelProcessInstanceByStartUser(loginUserId,
                new BpmProcessInstanceCancelReqVO()
                        .setId(application.getProcessInstanceId())
                        .setReason("申请人撤销请假申请"));
    }

    @Override
    public List<Map<String, Object>> getApproveProcessDefinitionList() {
        // 1. 校验分类和流程定义是否存在
        validateApproveCategoryAndProcessDefinition();