From 061cac2d75b9abe60cd29a5e9abae0e8e630739f Mon Sep 17 00:00:00 2001
From: tuqin <tuqin@local>
Date: 星期五, 06 十一月 2026 15:46:10 +0800
Subject: [PATCH] fix(hrm): 调岗提交不再强制要求 processDefinitionKey，并在审批通过后自动同步员工档案
---
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/salary/HrmSalaryCalculationController.java | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/salary/HrmSalaryCalculationController.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/salary/HrmSalaryCalculationController.java
index 10de4fd..d32cdd2 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/salary/HrmSalaryCalculationController.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/salary/HrmSalaryCalculationController.java
@@ -200,7 +200,7 @@
@PostMapping("/save")
@Operation(summary = "鎵归噺淇濆瓨钖叕鏍哥畻璁板綍")
- @PreAuthorize("@ss.hasPermission('hrm:salary-calculation:save')")
+ @PreAuthorize("@ss.hasPermission('hrm:salary-calculation:calculate')")
public CommonResult<Boolean> saveSalaryCalculation(@Valid @RequestBody HrmSalaryCalculationSaveReqVO saveReqVO) {
// 杞崲涓� DO 鍒楄〃
List<HrmSalaryCalculationDO> calculationList = saveReqVO.getList().stream()
@@ -215,4 +215,13 @@
return success(true);
}
+ @PutMapping("/update")
+ @Operation(summary = "淇敼钖叕鏍哥畻璁板綍", description = "浠呭緟纭鐘舵�佸彲淇敼锛涘疄鍙戝伐璧勭敱鍚庣鎸夋敹鍏�/鎵ｉ櫎椤归噸绠�")
+ @PreAuthorize("@ss.hasPermission('hrm:salary-calculation:calculate')")
+ public CommonResult<Boolean> updateSalaryCalculation(@Valid @RequestBody HrmSalaryCalculationRespVO updateReqVO) {
+ HrmSalaryCalculationDO calculation = BeanUtils.toBean(updateReqVO, HrmSalaryCalculationDO.class);
+ salaryCalculationService.updateSalaryCalculation(calculation);
+ return success(true);
+ }
+
}
\ No newline at end of file
--
Gitblit v1.9.3