From dfed60326c07756d3710d74c3aa44b537602adda Mon Sep 17 00:00:00 2001
From: yz <yz_0812@outlook.com>
Date: 星期二, 09 三月 2021 22:12:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpAccessoryController.java | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpAccessoryController.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpAccessoryController.java
index 3775104..43900f8 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpAccessoryController.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpAccessoryController.java
@@ -36,7 +36,6 @@
private final IEmpAccessoryService empAccessoryService;
@GetMapping
- @PreAuthorize("hasAuthority('empAccessory:list')")
public FebsResponse getAllEmpAccessorys(EmpAccessory empAccessory) {
return new FebsResponse().data(empAccessoryService.findEmpAccessorys(empAccessory));
}
@@ -49,7 +48,6 @@
}
@PostMapping
- @PreAuthorize("hasAuthority('empAccessory:add')")
public void addEmpAccessory(@NotNull(message = "{required}") Long labelid,@NotNull(message = "{required}") Long empId, MultipartFile file) throws FebsException {
try {
this.empAccessoryService.createEmpAccessory(labelid,file,empId);
@@ -129,4 +127,16 @@
throw new FebsException(message);
}
}
+
+
+ @PostMapping("autoInstall")
+ public void autoInstall( String fileids) throws FebsException {
+ try {
+ this.empAccessoryService.autoInstall(fileids);
+ } catch (Exception e) {
+ String message = "插入文件失败";
+ log.error(message, e);
+ throw new FebsException(message);
+ }
+ }
}
--
Gitblit v1.8.0