From 481d8165f26fc7e37f0e87f6444ac0340bb563a3 Mon Sep 17 00:00:00 2001
From: xiaoyi <908147524@qq.com>
Date: 星期二, 03 十一月 2026 18:53:22 +0800
Subject: [PATCH] fix: 移植长辉已验证的四类接口 500/体验问题（不含物料颜色字段）
---
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/salary/HrmSalaryCalculationController.java | 7 ++-----
1 files changed, 2 insertions(+), 5 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 b90e2bc..c7a405a 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
@@ -48,7 +48,6 @@
@GetMapping("/page")
@Operation(summary = "鑾峰緱钖叕鏍哥畻鍒嗛〉")
- @PreAuthorize("@ss.hasPermission('hrm:salary:query')")
public CommonResult<PageResult<HrmSalaryCalculationRespVO>> getSalaryCalculationPage(@Valid HrmSalaryCalculationPageReqVO pageReqVO) {
PageResult<HrmSalaryCalculationDO> pageResult = salaryCalculationService.getSalaryCalculationPage(pageReqVO);
// 杞崲涓� VO
@@ -100,7 +99,6 @@
@GetMapping("/get")
@Operation(summary = "鑾峰緱钖叕鏍哥畻")
@Parameter(name = "id", description = "鏍哥畻ID", required = true)
- @PreAuthorize("@ss.hasPermission('hrm:salary:query')")
public CommonResult<HrmSalaryCalculationRespVO> getSalaryCalculation(@RequestParam("id") Long id) {
HrmSalaryCalculationDO salaryCalculation = salaryCalculationService.getSalaryCalculation(id);
if (salaryCalculation == null) {
@@ -163,7 +161,7 @@
@GetMapping("/export-excel")
@Operation(summary = "瀵煎嚭钖叕鏍哥畻 Excel")
- @PreAuthorize("@ss.hasPermission('hrm:salary:export')")
+ @PreAuthorize("@ss.hasAnyPermissions('hrm:salary:export', 'hrm:salary-calculation:export')")
@ApiAccessLog(operateType = EXPORT)
public void exportSalaryCalculationExcel(@Valid HrmSalaryCalculationPageReqVO pageReqVO,
HttpServletResponse response) throws IOException {
@@ -183,7 +181,6 @@
@Operation(summary = "棰勮閮ㄩ棬涓嬫墍鏈夊憳宸ョ殑钖祫鏍哥畻淇℃伅")
@Parameter(name = "period", description = "鏍哥畻鍛ㄦ湡", required = true, example = "2024-01")
@Parameter(name = "deptId", description = "閮ㄩ棬ID锛屼负绌哄垯鏌ヨ鍏ㄩ儴", example = "1")
- @PreAuthorize("@ss.hasPermission('hrm:salary:query')")
public CommonResult<List<HrmSalaryCalculationRespVO>> previewSalaryCalculation(
@RequestParam("period") String period,
@RequestParam(value = "deptId", required = false) Long deptId) {
@@ -215,4 +212,4 @@
return success(true);
}
-}
\ No newline at end of file
+}
--
Gitblit v1.9.3