From 481d8165f26fc7e37f0e87f6444ac0340bb563a3 Mon Sep 17 00:00:00 2001
From: xiaoyi <908147524@qq.com>
Date: 星期二, 03 十一月 2026 18:53:22 +0800
Subject: [PATCH] fix: 移植长辉已验证的四类接口 500/体验问题（不含物料颜色字段）
---
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/HrmAttendanceHolidayController.java | 6 ++----
1 files changed, 2 insertions(+), 4 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 83cce65..08dec28 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
@@ -68,7 +68,6 @@
@GetMapping("/get")
@Operation(summary = "鑾峰緱鑺傚亣鏃ラ厤缃�")
@Parameter(name = "id", description = "鑺傚亣鏃D", required = true)
- @PreAuthorize("@ss.hasPermission('hrm:attendance:query')")
public CommonResult<HrmAttendanceHolidayRespVO> getAttendanceHoliday(@RequestParam("id") Long id) {
HrmAttendanceHolidayDO attendanceHoliday = attendanceHolidayService.getAttendanceHoliday(id);
return success(BeanUtils.toBean(attendanceHoliday, HrmAttendanceHolidayRespVO.class));
@@ -76,7 +75,6 @@
@GetMapping("/page")
@Operation(summary = "鑾峰緱鑺傚亣鏃ラ厤缃垎椤�")
- @PreAuthorize("@ss.hasPermission('hrm:attendance:query')")
public CommonResult<PageResult<HrmAttendanceHolidayRespVO>> getAttendanceHolidayPage(@Valid HrmAttendanceHolidayPageReqVO pageReqVO) {
PageResult<HrmAttendanceHolidayDO> pageResult = attendanceHolidayService.getAttendanceHolidayPage(pageReqVO);
return success(BeanUtils.toBean(pageResult, HrmAttendanceHolidayRespVO.class));
@@ -103,7 +101,7 @@
.type(1).isLegal(1).remark("").build()
);
// 杈撳嚭
- ExcelUtils.write(response, "鑺傚亣鏃ラ厤缃鍏ユā鏉�.xls", "鑺傚亣鏃ラ厤缃垪琛�", HrmAttendanceHolidayImportExcelVO.class, list);
+ ExcelUtils.writeTemplate(response, "鑺傚亣鏃ラ厤缃鍏ユā鏉�.xls", "鑺傚亣鏃ラ厤缃垪琛�", HrmAttendanceHolidayImportExcelVO.class, list);
}
@PostMapping("/import")
@@ -115,4 +113,4 @@
return success(attendanceHolidayService.importAttendanceHolidayList(list, importReqVO));
}
-}
\ No newline at end of file
+}
--
Gitblit v1.9.3