From a647bc8a43c0212f482bee0630ebd14dca120a8a Mon Sep 17 00:00:00 2001
From: 吴羡 <16976746+Xian-TT3@user.noreply.gitee.com>
Date: 星期一, 28 九月 2026 14:13:28 +0800
Subject: [PATCH] feat: CRM 发票/合同导入、MES 质检批量导入与检测台账、回款与报价校验、权限码细化
---
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/salary/HrmSalaryPaymentController.java | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/salary/HrmSalaryPaymentController.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/salary/HrmSalaryPaymentController.java
index ebb1fdd..594b2fb 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/salary/HrmSalaryPaymentController.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/salary/HrmSalaryPaymentController.java
@@ -47,7 +47,7 @@
@GetMapping("/page")
@Operation(summary = "鑾峰緱钖祫鍙戞斁鍒嗛〉")
- @PreAuthorize("@ss.hasPermission('hrm:salary:query')")
+ @PreAuthorize("@ss.hasPermission('hrm:salary-payment:query')")
public CommonResult<PageResult<HrmSalaryPaymentRespVO>> getSalaryPaymentPage(@Valid HrmSalaryPaymentPageReqVO pageReqVO) {
PageResult<HrmSalaryPaymentDO> pageResult = salaryPaymentService.getSalaryPaymentPage(pageReqVO);
return success(BeanUtils.toBean(pageResult, HrmSalaryPaymentRespVO.class));
@@ -56,7 +56,7 @@
@GetMapping("/get")
@Operation(summary = "鑾峰緱钖祫鍙戞斁")
@Parameter(name = "id", description = "鍙戞斁ID", required = true)
- @PreAuthorize("@ss.hasPermission('hrm:salary:query')")
+ @PreAuthorize("@ss.hasPermission('hrm:salary-payment:query')")
public CommonResult<HrmSalaryPaymentRespVO> getSalaryPayment(@RequestParam("id") Long id) {
HrmSalaryPaymentDO salaryPayment = salaryPaymentService.getSalaryPayment(id);
HrmSalaryPaymentRespVO respVO = BeanUtils.toBean(salaryPayment, HrmSalaryPaymentRespVO.class);
@@ -67,7 +67,7 @@
@PostMapping("/generate")
@Operation(summary = "鐢熸垚钖祫鍙戞斁鍙拌处")
@Parameter(name = "period", description = "鏍哥畻鍛ㄦ湡", required = true, example = "2024-01")
- @PreAuthorize("@ss.hasPermission('hrm:salary:generate')")
+ @PreAuthorize("@ss.hasPermission('hrm:salary-payment:generate')")
public CommonResult<Long> generatePayment(@RequestParam("period") String period) {
return success(salaryPaymentService.generatePayment(period));
}
@@ -75,7 +75,7 @@
@PostMapping("/pay")
@Operation(summary = "鍙戞斁钖祫锛堟暣涓彴璐︼級")
@Parameter(name = "id", description = "鍙戞斁鍙拌处ID", required = true)
- @PreAuthorize("@ss.hasPermission('hrm:salary:pay')")
+ @PreAuthorize("@ss.hasPermission('hrm:salary-payment:pay')")
public CommonResult<Boolean> paySalary(@RequestParam("id") Long id) {
salaryPaymentService.paySalary(id);
return success(true);
@@ -83,7 +83,7 @@
@PostMapping("/pay-detail")
@Operation(summary = "鎵归噺鍙戞斁钖祫鏄庣粏")
- @PreAuthorize("@ss.hasPermission('hrm:salary:pay')")
+ @PreAuthorize("@ss.hasPermission('hrm:salary-payment:pay')")
public CommonResult<Boolean> paySalaryDetail(@RequestBody Map<String, List<Long>> request) {
List<Long> detailIds = request.get("detailIds");
salaryPaymentService.paySalaryDetail(detailIds);
@@ -92,7 +92,7 @@
@PostMapping("/revoke-detail")
@Operation(summary = "鎵归噺鎾ら攢钖祫鍙戞斁鏄庣粏")
- @PreAuthorize("@ss.hasPermission('hrm:salary:pay')")
+ @PreAuthorize("@ss.hasPermission('hrm:salary-payment:pay')")
public CommonResult<Boolean> revokeSalaryPaymentDetail(@RequestBody Map<String, List<Long>> request) {
List<Long> detailIds = request.get("detailIds");
salaryPaymentService.revokeSalaryPaymentDetail(detailIds);
@@ -102,7 +102,7 @@
@DeleteMapping("/delete")
@Operation(summary = "鍒犻櫎钖祫鍙戞斁鍙拌处")
@Parameter(name = "id", description = "鍙戞斁鍙拌处ID", required = true)
- @PreAuthorize("@ss.hasPermission('hrm:salary:delete')")
+ @PreAuthorize("@ss.hasPermission('hrm:salary-payment:delete')")
public CommonResult<Boolean> deleteSalaryPayment(@RequestParam("id") Long id) {
salaryPaymentService.deleteSalaryPayment(id);
return success(true);
@@ -110,7 +110,7 @@
@GetMapping("/detail/page")
@Operation(summary = "鑾峰緱钖祫鍙戞斁鏄庣粏鍒嗛〉")
- @PreAuthorize("@ss.hasPermission('hrm:salary:query')")
+ @PreAuthorize("@ss.hasPermission('hrm:salary-payment:query')")
public CommonResult<PageResult<HrmSalaryPaymentDetailRespVO>> getSalaryPaymentDetailPage(@Valid HrmSalaryPaymentDetailPageReqVO pageReqVO) {
PageResult<HrmSalaryPaymentDetailDO> pageResult = salaryPaymentService.getSalaryPaymentDetailPage(pageReqVO);
List<HrmSalaryPaymentDetailRespVO> list = BeanUtils.toBean(pageResult.getList(), HrmSalaryPaymentDetailRespVO.class);
@@ -124,7 +124,7 @@
@GetMapping("/detail/list")
@Operation(summary = "鑾峰緱钖祫鍙戞斁鏄庣粏鍒楄〃")
@Parameter(name = "paymentId", description = "鍙戞斁鍙拌处ID", required = true)
- @PreAuthorize("@ss.hasPermission('hrm:salary:query')")
+ @PreAuthorize("@ss.hasPermission('hrm:salary-payment:query')")
public CommonResult<List<HrmSalaryPaymentDetailRespVO>> getSalaryPaymentDetailList(@RequestParam("paymentId") Long paymentId) {
List<HrmSalaryPaymentDetailDO> detailList = salaryPaymentService.getSalaryPaymentDetailListByPaymentId(paymentId);
List<HrmSalaryPaymentDetailRespVO> list = BeanUtils.toBean(detailList, HrmSalaryPaymentDetailRespVO.class);
--
Gitblit v1.9.3