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/attendance/HrmAttendanceRuleController.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/HrmAttendanceRuleController.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/HrmAttendanceRuleController.java
index 61c3d9d..dbeab37 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/HrmAttendanceRuleController.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/HrmAttendanceRuleController.java
@@ -44,14 +44,14 @@
@PostMapping("/create")
@Operation(summary = "鏂板鑰冨嫟瑙勫垯")
- @PreAuthorize("@ss.hasPermission('hrm:attendance:create')")
+ @PreAuthorize("@ss.hasPermission('hrm:attendance-rule:create')")
public CommonResult<Long> createAttendanceRule(@Valid @RequestBody HrmAttendanceRuleSaveReqVO createReqVO) {
return success(attendanceRuleService.createAttendanceRule(createReqVO));
}
@PutMapping("/update")
@Operation(summary = "鏇存柊鑰冨嫟瑙勫垯")
- @PreAuthorize("@ss.hasPermission('hrm:attendance:update')")
+ @PreAuthorize("@ss.hasPermission('hrm:attendance-rule:update')")
public CommonResult<Boolean> updateAttendanceRule(@Valid @RequestBody HrmAttendanceRuleSaveReqVO updateReqVO) {
attendanceRuleService.updateAttendanceRule(updateReqVO);
return success(true);
@@ -60,7 +60,7 @@
@DeleteMapping("/delete")
@Operation(summary = "鍒犻櫎鑰冨嫟瑙勫垯")
@Parameter(name = "id", description = "瑙勫垯ID", required = true)
- @PreAuthorize("@ss.hasPermission('hrm:attendance:delete')")
+ @PreAuthorize("@ss.hasPermission('hrm:attendance-rule:delete')")
public CommonResult<Boolean> deleteAttendanceRule(@RequestParam("id") Long id) {
attendanceRuleService.deleteAttendanceRule(id);
return success(true);
@@ -69,7 +69,7 @@
@GetMapping("/get")
@Operation(summary = "鑾峰緱鑰冨嫟瑙勫垯")
@Parameter(name = "id", description = "瑙勫垯ID", required = true)
- @PreAuthorize("@ss.hasPermission('hrm:attendance:query')")
+ @PreAuthorize("@ss.hasPermission('hrm:attendance-rule:query')")
public CommonResult<HrmAttendanceRuleRespVO> getAttendanceRule(@RequestParam("id") Long id) {
HrmAttendanceRuleDO attendanceRule = attendanceRuleService.getAttendanceRule(id);
if (attendanceRule == null) {
@@ -88,7 +88,7 @@
@GetMapping("/page")
@Operation(summary = "鑾峰緱鑰冨嫟瑙勫垯鍒嗛〉")
- @PreAuthorize("@ss.hasPermission('hrm:attendance:query')")
+ @PreAuthorize("@ss.hasPermission('hrm:attendance-rule:query')")
public CommonResult<PageResult<HrmAttendanceRuleRespVO>> getAttendanceRulePage(@Valid HrmAttendanceRulePageReqVO pageReqVO) {
PageResult<HrmAttendanceRuleDO> pageResult = attendanceRuleService.getAttendanceRulePage(pageReqVO);
List<HrmAttendanceRuleRespVO> list = BeanUtils.toBean(pageResult.getList(), HrmAttendanceRuleRespVO.class);
@@ -111,7 +111,7 @@
@GetMapping("/list")
@Operation(summary = "鑾峰緱鑰冨嫟瑙勫垯鍒楄〃")
- @PreAuthorize("@ss.hasPermission('hrm:attendance:query')")
+ @PreAuthorize("@ss.hasPermission('hrm:attendance-rule:query')")
public CommonResult<List<HrmAttendanceRuleRespVO>> getAttendanceRuleList() {
List<HrmAttendanceRuleDO> list = attendanceRuleService.getAttendanceRuleList();
return success(BeanUtils.toBean(list, HrmAttendanceRuleRespVO.class));
@@ -119,7 +119,7 @@
@GetMapping("/export-excel")
@Operation(summary = "瀵煎嚭鑰冨嫟瑙勫垯 Excel")
- @PreAuthorize("@ss.hasPermission('hrm:attendance:export')")
+ @PreAuthorize("@ss.hasPermission('hrm:attendance-rule:export')")
@ApiAccessLog(operateType = EXPORT)
public void exportAttendanceRuleExcel(@Valid HrmAttendanceRulePageReqVO pageReqVO,
HttpServletResponse response) throws IOException {
--
Gitblit v1.9.3