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/HrmAttendanceRecordController.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/HrmAttendanceRecordController.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/HrmAttendanceRecordController.java
index 9f94ad3..22cae5c 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/HrmAttendanceRecordController.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/HrmAttendanceRecordController.java
@@ -56,7 +56,7 @@
@PostMapping("/clock-in")
@Operation(summary = "涓婄彮鎵撳崱")
- @PreAuthorize("@ss.hasPermission('hrm:attendance:clock')")
+ @PreAuthorize("@ss.hasPermission('hrm:attendance-record:clock')")
public CommonResult<HrmAttendanceRecordRespVO> clockIn(@RequestParam("location") String location) {
Long loginUserId = getLoginUserId();
HrmEmployeeDO employee = employeeService.getEmployeeByUserId(loginUserId);
@@ -77,7 +77,7 @@
@PostMapping("/clock-out")
@Operation(summary = "涓嬬彮鎵撳崱")
- @PreAuthorize("@ss.hasPermission('hrm:attendance:clock')")
+ @PreAuthorize("@ss.hasPermission('hrm:attendance-record:clock')")
public CommonResult<HrmAttendanceRecordRespVO> clockOut(@RequestParam("location") String location) {
Long loginUserId = getLoginUserId();
HrmEmployeeDO employee = employeeService.getEmployeeByUserId(loginUserId);
@@ -102,7 +102,7 @@
@GetMapping("/page")
@Operation(summary = "鑾峰緱鑰冨嫟璁板綍鍒嗛〉")
- @PreAuthorize("@ss.hasPermission('hrm:attendance:query')")
+ @PreAuthorize("@ss.hasPermission('hrm:attendance-record:query')")
public CommonResult<PageResult<HrmAttendanceRecordRespVO>> getAttendanceRecordPage(@Valid HrmAttendanceRecordPageReqVO pageReqVO) {
PageResult<HrmAttendanceRecordDO> pageResult = attendanceRecordService.getAttendanceRecordPage(pageReqVO);
// 杞崲涓� VO
@@ -157,7 +157,7 @@
@GetMapping("/get")
@Operation(summary = "鑾峰緱鑰冨嫟璁板綍")
@Parameter(name = "id", description = "璁板綍ID", required = true)
- @PreAuthorize("@ss.hasPermission('hrm:attendance:query')")
+ @PreAuthorize("@ss.hasPermission('hrm:attendance-record:query')")
public CommonResult<HrmAttendanceRecordRespVO> getAttendanceRecord(@RequestParam("id") Long id) {
HrmAttendanceRecordDO attendanceRecord = attendanceRecordService.getAttendanceRecord(id);
if (attendanceRecord == null) {
@@ -281,7 +281,7 @@
@GetMapping("/export-excel")
@Operation(summary = "瀵煎嚭鑰冨嫟璁板綍 Excel")
- @PreAuthorize("@ss.hasPermission('hrm:attendance:export')")
+ @PreAuthorize("@ss.hasPermission('hrm:attendance-record:export')")
@ApiAccessLog(operateType = EXPORT)
public void exportAttendanceRecordExcel(@Valid HrmAttendanceRecordPageReqVO pageReqVO,
HttpServletResponse response) throws IOException {
--
Gitblit v1.9.3