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/controller/admin/approval/HrmLeaveApplicationController.java | 21 +++++++++++++--------
1 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/approval/HrmLeaveApplicationController.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/approval/HrmLeaveApplicationController.java
index f362ce9..865ae93 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/approval/HrmLeaveApplicationController.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/approval/HrmLeaveApplicationController.java
@@ -5,12 +5,11 @@
import cn.iocoder.yudao.framework.common.pojo.PageParam;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
+import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils;
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;
import cn.iocoder.yudao.module.hrm.service.approval.HrmLeaveApplicationService;
-import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
-import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
@@ -36,8 +35,6 @@
@Resource
private HrmLeaveApplicationService leaveApplicationService;
- @Resource
- private AdminUserApi adminUserApi;
@PostMapping("/create")
@Operation(summary = "鍒涘缓璇峰亣鐢宠")
@@ -85,13 +82,21 @@
@PreAuthorize("@ss.hasPermission('hrm:leave:submit')")
public CommonResult<Boolean> submitLeaveApplication(@RequestParam("id") Long id,
@RequestParam("processDefinitionKey") String processDefinitionKey) {
- // 鑾峰彇褰撳墠鐢ㄦ埛ID
- AdminUserRespDTO user = adminUserApi.getUser(1L); // TODO: 鑾峰彇褰撳墠鐧诲綍鐢ㄦ埛
- leaveApplicationService.submitLeaveApplication(id, processDefinitionKey, user.getId());
+ Long userId = SecurityFrameworkUtils.getLoginUserId();
+ leaveApplicationService.submitLeaveApplication(id, processDefinitionKey, userId);
return success(true);
}
- @GetMapping("/approve-process-definition-list")
+ @PostMapping("/cancel")
+ @Operation(summary = "鎾ら攢鐢宠")
+ @Parameter(name = "id", description = "鐢宠ID", required = true)
+ @PreAuthorize("@ss.hasPermission('hrm:leave:cancel')")
+ public CommonResult<Boolean> cancelLeaveApplication(@RequestParam("id") Long id) {
+ leaveApplicationService.cancel(id, SecurityFrameworkUtils.getLoginUserId());
+ return success(true);
+ }
+
+@GetMapping("/approve-process-definition-list")
@Operation(summary = "鑾峰彇鍙敤鐨勫鎵规祦绋嬪畾涔夊垪琛�")
@PreAuthorize("@ss.hasPermission('hrm:leave:query')")
public CommonResult<List<Map<String, Object>>> getApproveProcessDefinitionList() {
--
Gitblit v1.9.3