From 736b58a43b0afb40745f885f400ef97d070f46a9 Mon Sep 17 00:00:00 2001
From: 孔祥富 <kongxf@daryun.com>
Date: 星期四, 04 三月 2021 22:02:44 +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 | 13 +++++++++++--
1 files changed, 11 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 a144f95..ebfb517 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
@@ -16,7 +16,6 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import javax.validation.Valid;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.util.Map;
@@ -50,7 +49,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);
@@ -119,4 +117,15 @@
throw new FebsException(message);
}
}
+ @GetMapping("{labelid}")
+ @PreAuthorize("hasAuthority('empAccessory:delete')")
+ public FebsResponse getLabelCount(@PathVariable(value = "labelid") String labelid) throws FebsException {
+ try {
+ return new FebsResponse().data(empAccessoryService.getLabelCount(Long.valueOf(labelid)));
+ } catch (Exception e) {
+ String message = "修改Label失败";
+ log.error(message, e);
+ throw new FebsException(message);
+ }
+ }
}
--
Gitblit v1.8.0