From d85ec778237cd9af68c8d6b96895d22e0cf158df Mon Sep 17 00:00:00 2001
From: tuqin <tuqin@tuqin.cn>
Date: 星期一, 02 十一月 2026 14:15:17 +0800
Subject: [PATCH] fix(hrm/system): 修复调岗申请与提交报错、公积金误扣、用户搜索，新增核算批量删除
---
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/approval/HrmTransferApplicationController.java | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/approval/HrmTransferApplicationController.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/approval/HrmTransferApplicationController.java
index 83cd690..460a652 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/approval/HrmTransferApplicationController.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/approval/HrmTransferApplicationController.java
@@ -82,10 +82,10 @@
@PostMapping("/submit")
@Operation(summary = "鎻愪氦璋冨矖鐢宠瀹℃壒")
@Parameter(name = "id", description = "鐢宠ID", required = true)
- @Parameter(name = "processDefinitionKey", description = "娴佺▼瀹氫箟Key", required = true)
+ @Parameter(name = "processDefinitionKey", description = "娴佺▼瀹氫箟Key锛堜笉浼犳椂鑷姩浣跨敤銆岃皟鍔ㄥ鎵广�嶅垎绫讳笅鏈�鏂扮殑娲昏穬娴佺▼锛�")
@PreAuthorize("@ss.hasPermission('hrm:transfer:submit')")
public CommonResult<Boolean> submitTransferApplication(@RequestParam("id") Long id,
- @RequestParam("processDefinitionKey") String processDefinitionKey) {
+ @RequestParam(value = "processDefinitionKey", required = false) String processDefinitionKey) {
Long userId = SecurityFrameworkUtils.getLoginUserId();
transferApplicationService.submitTransferApplication(id, processDefinitionKey, userId);
return success(true);
@@ -98,6 +98,15 @@
return success(transferApplicationService.getApproveProcessDefinitionList());
}
+ @PostMapping("/cancel")
+ @Operation(summary = "鎾ら攢璋冨矖鐢宠")
+ @Parameter(name = "id", description = "鐢宠ID", required = true)
+ @PreAuthorize("@ss.hasPermission('hrm:transfer:cancel')")
+ public CommonResult<Boolean> cancelTransferApplication(@RequestParam("id") Long id) {
+ transferApplicationService.cancelTransferApplication(id, SecurityFrameworkUtils.getLoginUserId());
+ return success(true);
+ }
+
@GetMapping("/export-excel")
@Operation(summary = "瀵煎嚭璋冨矖鐢宠 Excel")
@PreAuthorize("@ss.hasPermission('hrm:transfer:export')")
--
Gitblit v1.9.3