From a67dab8161c7428aa7cbd6f9051dd5ae77af4ed8 Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期六, 07 十一月 2026 19:13:41 +0800
Subject: [PATCH] fix: 修复考勤异常并验证原材料销售审批
---
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/salary/HrmEmployeeSocialSecurityController.java | 8 ++------
1 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/salary/HrmEmployeeSocialSecurityController.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/salary/HrmEmployeeSocialSecurityController.java
index b9dfff2..3587ccc 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/salary/HrmEmployeeSocialSecurityController.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/salary/HrmEmployeeSocialSecurityController.java
@@ -81,7 +81,6 @@
@GetMapping("/get")
@Operation(summary = "鑾峰彇鍛樺伐绀句繚鍏Н閲戞。妗�")
@Parameter(name = "id", description = "妗ｆID", required = true)
- @PreAuthorize("@ss.hasPermission('hrm:social-security:query')")
public CommonResult<HrmEmployeeSocialSecurityRespVO> getEmployeeSocialSecurity(@RequestParam("id") Long id) {
HrmEmployeeSocialSecurityDO socialSecurity = employeeSocialSecurityService.getEmployeeSocialSecurity(id);
if (socialSecurity == null) {
@@ -96,7 +95,6 @@
@GetMapping("/page")
@Operation(summary = "鑾峰彇鍛樺伐绀句繚鍏Н閲戞。妗堝垎椤�")
- @PreAuthorize("@ss.hasPermission('hrm:social-security:query')")
public CommonResult<PageResult<HrmEmployeeSocialSecurityRespVO>> getEmployeeSocialSecurityPage(
@Valid HrmEmployeeSocialSecurityPageReqVO pageReqVO) {
PageResult<HrmEmployeeSocialSecurityDO> pageResult = employeeSocialSecurityService.getEmployeeSocialSecurityPage(pageReqVO);
@@ -165,7 +163,6 @@
@GetMapping("/list-by-user")
@Operation(summary = "鑾峰彇鍛樺伐绀句繚鍏Н閲戞。妗堝巻鍙插垪琛�")
@Parameter(name = "userId", description = "绯荤粺鐢ㄦ埛ID", required = true)
- @PreAuthorize("@ss.hasPermission('hrm:social-security:query')")
public CommonResult<List<HrmEmployeeSocialSecurityRespVO>> getEmployeeSocialSecurityList(
@RequestParam("userId") Long userId) {
List<HrmEmployeeSocialSecurityDO> list = employeeSocialSecurityService.getEmployeeSocialSecurityList(userId);
@@ -182,7 +179,6 @@
@GetMapping("/get-latest")
@Operation(summary = "鑾峰彇鍛樺伐鏈�鏂扮敓鏁堢殑绀句繚鍏Н閲戞。妗�")
@Parameter(name = "userId", description = "绯荤粺鐢ㄦ埛ID", required = true)
- @PreAuthorize("@ss.hasPermission('hrm:social-security:query')")
public CommonResult<HrmEmployeeSocialSecurityRespVO> getLatestEmployeeSocialSecurity(
@RequestParam("userId") Long userId) {
HrmEmployeeSocialSecurityDO socialSecurity = employeeSocialSecurityService.getLatestEmployeeSocialSecurity(userId);
@@ -235,7 +231,7 @@
.effectiveDate(LocalDate.of(2026, 1, 1)).status(0).remark("").build()
);
// 杈撳嚭
- ExcelUtils.write(response, "鍛樺伐绀句繚鍏Н閲戞。妗堝鍏ユā鏉�.xls", "鍛樺伐绀句繚鍏Н閲戞。妗堝垪琛�",
+ ExcelUtils.writeTemplate(response, "鍛樺伐绀句繚鍏Н閲戞。妗堝鍏ユā鏉�.xls", "鍛樺伐绀句繚鍏Н閲戞。妗堝垪琛�",
HrmEmployeeSocialSecurityImportExcelVO.class, list);
}
@@ -248,4 +244,4 @@
return success(employeeSocialSecurityService.importEmployeeSocialSecurityList(list, importReqVO));
}
-}
\ No newline at end of file
+}
--
Gitblit v1.9.3