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/HrmAttendanceSummaryController.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/HrmAttendanceSummaryController.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/HrmAttendanceSummaryController.java
index a684c8a..2f5c8d1 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/HrmAttendanceSummaryController.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/HrmAttendanceSummaryController.java
@@ -47,7 +47,7 @@
@GetMapping("/page")
@Operation(summary = "鑾峰緱鑰冨嫟缁熻姹囨�诲垎椤�")
- @PreAuthorize("@ss.hasPermission('hrm:attendance:query')")
+ @PreAuthorize("@ss.hasPermission('hrm:attendance-summary:query')")
public CommonResult<PageResult<HrmAttendanceSummaryRespVO>> getAttendanceSummaryPage(@Valid HrmAttendanceSummaryPageReqVO pageReqVO) {
PageResult<HrmAttendanceSummaryDO> pageResult = attendanceSummaryService.getAttendanceSummaryPage(pageReqVO);
List<HrmAttendanceSummaryRespVO> list = BeanUtils.toBean(pageResult.getList(), HrmAttendanceSummaryRespVO.class);
@@ -96,7 +96,7 @@
@GetMapping("/get")
@Operation(summary = "鑾峰緱鍛樺伐鏈堝害鑰冨嫟姹囨��")
- @PreAuthorize("@ss.hasPermission('hrm:attendance:query')")
+ @PreAuthorize("@ss.hasPermission('hrm:attendance-summary:query')")
public CommonResult<HrmAttendanceSummaryRespVO> getMonthlySummary(
@RequestParam("userId") Long userId,
@RequestParam("yearMonth") String yearMonth) {
@@ -122,7 +122,7 @@
@PostMapping("/generate")
@Operation(summary = "鐢熸垚鏈堝害鑰冨嫟姹囨��")
@Parameter(name = "yearMonth", description = "骞存湀锛屾牸寮忥細yyyy-MM", required = true)
- @PreAuthorize("@ss.hasPermission('hrm:attendance:calculate')")
+ @PreAuthorize("@ss.hasPermission('hrm:attendance-summary:generate')")
public CommonResult<Boolean> generateMonthlySummary(@RequestParam("yearMonth") String yearMonth,
@RequestParam(value = "deptId", required = false) Long deptId,
@RequestParam(value = "userId", required = false) Long userId) {
@@ -138,7 +138,7 @@
@GetMapping("/export-excel")
@Operation(summary = "瀵煎嚭鑰冨嫟缁熻姹囨�� Excel")
- @PreAuthorize("@ss.hasPermission('hrm:attendance:export')")
+ @PreAuthorize("@ss.hasPermission('hrm:attendance-summary:export')")
@ApiAccessLog(operateType = EXPORT)
public void exportAttendanceSummaryExcel(@Valid HrmAttendanceSummaryPageReqVO pageReqVO,
HttpServletResponse response) throws IOException {
--
Gitblit v1.9.3