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/HrmAttendanceHolidayController.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/attendance/HrmAttendanceHolidayController.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/HrmAttendanceHolidayController.java
index 4c99256..0546d23 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/HrmAttendanceHolidayController.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/HrmAttendanceHolidayController.java
@@ -38,14 +38,14 @@
@PostMapping("/create")
@Operation(summary = "鏂板鑺傚亣鏃ラ厤缃�")
- @PreAuthorize("@ss.hasPermission('hrm:attendance:create')")
+ @PreAuthorize("@ss.hasPermission('hrm:attendance-holiday:create')")
public CommonResult<Long> createAttendanceHoliday(@Valid @RequestBody HrmAttendanceHolidaySaveReqVO createReqVO) {
return success(attendanceHolidayService.createAttendanceHoliday(createReqVO));
}
@PutMapping("/update")
@Operation(summary = "鏇存柊鑺傚亣鏃ラ厤缃�")
- @PreAuthorize("@ss.hasPermission('hrm:attendance:update')")
+ @PreAuthorize("@ss.hasPermission('hrm:attendance-holiday:update')")
public CommonResult<Boolean> updateAttendanceHoliday(@Valid @RequestBody HrmAttendanceHolidaySaveReqVO updateReqVO) {
attendanceHolidayService.updateAttendanceHoliday(updateReqVO);
return success(true);
@@ -54,7 +54,7 @@
@DeleteMapping("/delete")
@Operation(summary = "鍒犻櫎鑺傚亣鏃ラ厤缃�")
@Parameter(name = "id", description = "鑺傚亣鏃D", required = true)
- @PreAuthorize("@ss.hasPermission('hrm:attendance:delete')")
+ @PreAuthorize("@ss.hasPermission('hrm:attendance-holiday:delete')")
public CommonResult<Boolean> deleteAttendanceHoliday(@RequestParam("id") Long id) {
attendanceHolidayService.deleteAttendanceHoliday(id);
return success(true);
@@ -63,7 +63,7 @@
@GetMapping("/get")
@Operation(summary = "鑾峰緱鑺傚亣鏃ラ厤缃�")
@Parameter(name = "id", description = "鑺傚亣鏃D", required = true)
- @PreAuthorize("@ss.hasPermission('hrm:attendance:query')")
+ @PreAuthorize("@ss.hasPermission('hrm:attendance-holiday:query')")
public CommonResult<HrmAttendanceHolidayRespVO> getAttendanceHoliday(@RequestParam("id") Long id) {
HrmAttendanceHolidayDO attendanceHoliday = attendanceHolidayService.getAttendanceHoliday(id);
return success(BeanUtils.toBean(attendanceHoliday, HrmAttendanceHolidayRespVO.class));
@@ -71,7 +71,7 @@
@GetMapping("/page")
@Operation(summary = "鑾峰緱鑺傚亣鏃ラ厤缃垎椤�")
- @PreAuthorize("@ss.hasPermission('hrm:attendance:query')")
+ @PreAuthorize("@ss.hasPermission('hrm:attendance-holiday:query')")
public CommonResult<PageResult<HrmAttendanceHolidayRespVO>> getAttendanceHolidayPage(@Valid HrmAttendanceHolidayPageReqVO pageReqVO) {
PageResult<HrmAttendanceHolidayDO> pageResult = attendanceHolidayService.getAttendanceHolidayPage(pageReqVO);
return success(BeanUtils.toBean(pageResult, HrmAttendanceHolidayRespVO.class));
@@ -79,7 +79,7 @@
@GetMapping("/export-excel")
@Operation(summary = "瀵煎嚭鑺傚亣鏃ラ厤缃� Excel")
- @PreAuthorize("@ss.hasPermission('hrm:attendance:export')")
+ @PreAuthorize("@ss.hasPermission('hrm:attendance-holiday:export')")
@ApiAccessLog(operateType = EXPORT)
public void exportAttendanceHolidayExcel(@Valid HrmAttendanceHolidayPageReqVO pageReqVO,
HttpServletResponse response) throws IOException {
--
Gitblit v1.9.3