From 1d372d5e4916eaecf9b773e52e0d887d4fd0e47a Mon Sep 17 00:00:00 2001
From: tuqin <tuqin@tuqin.cn>
Date: 星期四, 05 十一月 2026 15:02:27 +0800
Subject: [PATCH] fix(hrm): 社保扣款在员工未加社保时误扣、两方案扣款相同
---
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/approval/HrmResignationApplicationController.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/approval/HrmResignationApplicationController.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/approval/HrmResignationApplicationController.java
index 7bd6ef8..a4e33a1 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/approval/HrmResignationApplicationController.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/approval/HrmResignationApplicationController.java
@@ -83,10 +83,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:resignation:submit')")
public CommonResult<Boolean> submitResignationApplication(@RequestParam("id") Long id,
- @RequestParam("processDefinitionKey") String processDefinitionKey) {
+ @RequestParam(value = "processDefinitionKey", required = false) String processDefinitionKey) {
Long userId = SecurityFrameworkUtils.getLoginUserId();
resignationApplicationService.submitResignationApplication(id, processDefinitionKey, userId);
return success(true);
--
Gitblit v1.9.3