From fb9823428a7705d8ed8e2f4128e525df3781e968 Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期二, 03 八月 2021 10:21:09 +0800
Subject: [PATCH] fix(bug修复): 导入的新员工增加了入离职记录；重新处理了导入的日期格式
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/FilesUploadController.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/FilesUploadController.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/FilesUploadController.java
index d5d2834..85c9a9d 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/FilesUploadController.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/FilesUploadController.java
@@ -49,7 +49,6 @@
}
@PostMapping
- @PreAuthorize("hasAuthority('filesUpload:add')")
public void addFilesUpload(@NotNull(message = "{required}") Long folderid, MultipartFile file) throws FebsException {
try {
this.filesUploadService.createFilesUpload(folderid, file);
@@ -93,7 +92,7 @@
} catch (Exception e) {
String message = "修改FilesUpload失败";
log.error(message, e);
- throw new FebsException(message);
+ throw new FebsException(e.getMessage());
}
}
@@ -108,4 +107,15 @@
throw new FebsException(message);
}
}
+
+ @GetMapping("image/{filesid}")
+ public void getImage(@PathVariable String filesid, HttpServletResponse response) throws FebsException {
+ try {
+ this.filesUploadService.getImage(filesid,response);
+ } catch (Exception e) {
+ String message = "获取员工图片异常";
+ log.error(message, e);
+ throw new FebsException(message);
+ }
+ }
}
--
Gitblit v1.8.0