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/HrmAttendanceExceptionController.java | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/HrmAttendanceExceptionController.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/HrmAttendanceExceptionController.java
index 33c9f4a..2126cab 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/HrmAttendanceExceptionController.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/HrmAttendanceExceptionController.java
@@ -13,6 +13,7 @@
import cn.iocoder.yudao.module.hrm.service.employee.HrmEmployeeService;
import cn.iocoder.yudao.module.system.api.dept.DeptApi;
import cn.iocoder.yudao.module.system.api.dept.dto.DeptRespDTO;
+import cn.iocoder.yudao.module.system.api.storage.StorageAttachmentApi;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
@@ -39,17 +40,19 @@
private HrmEmployeeService employeeService;
@Resource
private DeptApi deptApi;
+ @Resource
+ private StorageAttachmentApi storageAttachmentApi;
@PostMapping("/create")
@Operation(summary = "鏂板鑰冨嫟寮傚父鐢宠")
- @PreAuthorize("@ss.hasPermission('hrm:attendance:create')")
+ @PreAuthorize("@ss.hasPermission('hrm:attendance-exception:create')")
public CommonResult<Long> createAttendanceException(@Valid @RequestBody HrmAttendanceExceptionSaveReqVO createReqVO) {
return success(attendanceExceptionService.createAttendanceException(createReqVO));
}
@PutMapping("/update")
@Operation(summary = "鏇存柊鑰冨嫟寮傚父鐢宠")
- @PreAuthorize("@ss.hasPermission('hrm:attendance:update')")
+ @PreAuthorize("@ss.hasPermission('hrm:attendance-exception:update')")
public CommonResult<Boolean> updateAttendanceException(@Valid @RequestBody HrmAttendanceExceptionSaveReqVO updateReqVO) {
attendanceExceptionService.updateAttendanceException(updateReqVO);
return success(true);
@@ -58,7 +61,7 @@
@DeleteMapping("/delete")
@Operation(summary = "鍒犻櫎鑰冨嫟寮傚父鐢宠")
@Parameter(name = "id", description = "鐢宠ID", required = true)
- @PreAuthorize("@ss.hasPermission('hrm:attendance:delete')")
+ @PreAuthorize("@ss.hasPermission('hrm:attendance-exception:delete')")
public CommonResult<Boolean> deleteAttendanceException(@RequestParam("id") Long id) {
attendanceExceptionService.deleteAttendanceException(id);
return success(true);
@@ -67,7 +70,7 @@
@GetMapping("/get")
@Operation(summary = "鑾峰緱鑰冨嫟寮傚父鐢宠")
@Parameter(name = "id", description = "鐢宠ID", required = true)
- @PreAuthorize("@ss.hasPermission('hrm:attendance:query')")
+ @PreAuthorize("@ss.hasPermission('hrm:attendance-exception:query')")
public CommonResult<HrmAttendanceExceptionRespVO> getAttendanceException(@RequestParam("id") Long id) {
HrmAttendanceExceptionDO attendanceException = attendanceExceptionService.getAttendanceException(id);
if (attendanceException == null) {
@@ -87,12 +90,13 @@
respVO.setDeptName(dept.getName());
}
}
+ respVO.setAttachmentList(storageAttachmentApi.listAttachments("hrm_attendance_exception", id));
return success(respVO);
}
@GetMapping("/page")
@Operation(summary = "鑾峰緱鑰冨嫟寮傚父鐢宠鍒嗛〉")
- @PreAuthorize("@ss.hasPermission('hrm:attendance:query')")
+ @PreAuthorize("@ss.hasPermission('hrm:attendance-exception:query')")
public CommonResult<PageResult<HrmAttendanceExceptionRespVO>> getAttendanceExceptionPage(@Valid HrmAttendanceExceptionPageReqVO pageReqVO) {
PageResult<HrmAttendanceExceptionDO> pageResult = attendanceExceptionService.getAttendanceExceptionPage(pageReqVO);
List<HrmAttendanceExceptionRespVO> list = BeanUtils.toBean(pageResult.getList(), HrmAttendanceExceptionRespVO.class);
@@ -141,7 +145,7 @@
@PostMapping("/submit")
@Operation(summary = "鎻愪氦鑰冨嫟寮傚父鐢宠")
- @PreAuthorize("@ss.hasPermission('hrm:attendance:submit')")
+ @PreAuthorize("@ss.hasPermission('hrm:attendance-exception:submit')")
public CommonResult<Boolean> submitAttendanceException(
@RequestParam("id") Long id,
@RequestParam("processDefinitionKey") String processDefinitionKey) {
--
Gitblit v1.9.3