From 8b4105c2d327e09ce2664bbd7cf96559be2f788b Mon Sep 17 00:00:00 2001
From: xiaoyi <908147524@qq.com>
Date: 星期五, 30 十月 2026 20:13:16 +0800
Subject: [PATCH] fix(hrm): 补齐请假/离职/调岗的撤销接口，修复点击撤销报 404
---
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/approval/HrmLeaveApplicationServiceImpl.java | 19 +++++++++++++++++++
1 files changed, 19 insertions(+), 0 deletions(-)
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/approval/HrmLeaveApplicationServiceImpl.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/approval/HrmLeaveApplicationServiceImpl.java
index cec35b5..fa76208 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/approval/HrmLeaveApplicationServiceImpl.java
+++ b/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;
@@ -69,6 +71,8 @@
private StorageAttachmentApi storageAttachmentApi;
@Resource
private BpmProcessDefinitionService bpmProcessDefinitionService;
+ @Resource
+ private BpmProcessInstanceService bpmProcessInstanceService;
@Override
@Transactional(rollbackFor = Exception.class)
@@ -283,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();
--
Gitblit v1.9.3