From d6ffbf2958eefb57fb36acc12709fe42f7bce556 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期五, 09 十月 2026 14:51:13 +0800
Subject: [PATCH] fix: HRM 删除员工级联删除关联系统用户；MES 首页统计 summary 兼容设备状态为空
---
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/salary/HrmTaxRateConfigController.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/salary/HrmTaxRateConfigController.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/salary/HrmTaxRateConfigController.java
index 2df35be..9478817 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/salary/HrmTaxRateConfigController.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/salary/HrmTaxRateConfigController.java
@@ -31,7 +31,7 @@
@PostMapping("/create-list")
@Operation(summary = "鎵归噺鍒涘缓涓◣绋庣巼閰嶇疆锛堜竴涓◣鐜囪〃鍖呭惈7涓。浣嶏級")
- @PreAuthorize("@ss.hasPermission('hrm:tax-rate:create')")
+ @PreAuthorize("@ss.hasPermission('hrm:tax-rate-config:create')")
public CommonResult<Boolean> createTaxRateConfigList(@Valid @RequestBody List<HrmTaxRateConfigSaveReqVO> createReqVOList) {
List<HrmTaxRateConfigDO> configList = BeanUtils.toBean(createReqVOList, HrmTaxRateConfigDO.class);
taxRateConfigService.createTaxRateConfigList(configList);
@@ -40,7 +40,7 @@
@PutMapping("/update")
@Operation(summary = "鏇存柊涓◣绋庣巼閰嶇疆")
- @PreAuthorize("@ss.hasPermission('hrm:tax-rate:update')")
+ @PreAuthorize("@ss.hasPermission('hrm:tax-rate-config:update')")
public CommonResult<Boolean> updateTaxRateConfig(@Valid @RequestBody HrmTaxRateConfigSaveReqVO updateReqVO) {
HrmTaxRateConfigDO config = BeanUtils.toBean(updateReqVO, HrmTaxRateConfigDO.class);
taxRateConfigService.updateTaxRateConfig(config);
@@ -50,7 +50,7 @@
@DeleteMapping("/delete")
@Operation(summary = "鍒犻櫎涓◣绋庣巼閰嶇疆")
@Parameter(name = "id", description = "閰嶇疆ID", required = true)
- @PreAuthorize("@ss.hasPermission('hrm:tax-rate:delete')")
+ @PreAuthorize("@ss.hasPermission('hrm:tax-rate-config:delete')")
public CommonResult<Boolean> deleteTaxRateConfig(@RequestParam("id") Long id) {
taxRateConfigService.deleteTaxRateConfig(id);
return success(true);
@@ -59,7 +59,7 @@
@GetMapping("/get")
@Operation(summary = "鑾峰彇涓◣绋庣巼閰嶇疆")
@Parameter(name = "id", description = "閰嶇疆ID", required = true)
- @PreAuthorize("@ss.hasPermission('hrm:tax-rate:query')")
+ @PreAuthorize("@ss.hasPermission('hrm:tax-rate-config:query')")
public CommonResult<HrmTaxRateConfigRespVO> getTaxRateConfig(@RequestParam("id") Long id) {
HrmTaxRateConfigDO config = taxRateConfigService.getTaxRateConfig(id);
return success(BeanUtils.toBean(config, HrmTaxRateConfigRespVO.class));
@@ -67,7 +67,7 @@
@GetMapping("/list")
@Operation(summary = "鑾峰彇涓◣绋庣巼閰嶇疆鍒楄〃")
- @PreAuthorize("@ss.hasPermission('hrm:tax-rate:query')")
+ @PreAuthorize("@ss.hasPermission('hrm:tax-rate-config:query')")
public CommonResult<List<HrmTaxRateConfigRespVO>> getTaxRateConfigList() {
List<HrmTaxRateConfigDO> list = taxRateConfigService.getTaxRateConfigList();
return success(BeanUtils.toBean(list, HrmTaxRateConfigRespVO.class));
@@ -76,7 +76,7 @@
@GetMapping("/get-effective")
@Operation(summary = "鑾峰彇鐢熸晥鐨勪釜绋庣◣鐜囬厤缃垪琛紙鎸夌骇鏁版帓搴忥級")
@Parameter(name = "effectiveDate", description = "鐢熸晥鏃ユ湡", required = true)
- @PreAuthorize("@ss.hasPermission('hrm:tax-rate:query')")
+ @PreAuthorize("@ss.hasPermission('hrm:tax-rate-config:query')")
public CommonResult<List<HrmTaxRateConfigRespVO>> getEffectiveTaxRateConfigList(
@RequestParam("effectiveDate") LocalDate effectiveDate) {
List<HrmTaxRateConfigDO> list = taxRateConfigService.getEffectiveTaxRateConfigList(effectiveDate);
--
Gitblit v1.9.3