From 4fe77f83783b35d9e541d6dd56d95b40f0af0670 Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期四, 18 三月 2021 07:19:41 +0800
Subject: [PATCH] fix(bug修复): 重新打开档案时，将原离职日期设置成1900-01-01，以便前端不再显示
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/FilesUploadController.java | 25 ++++++++++++++++++++++++-
1 files changed, 24 insertions(+), 1 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 2a61f45..6473101 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
@@ -50,7 +50,7 @@
@PostMapping
@PreAuthorize("hasAuthority('filesUpload:add')")
- public void addFilesUpload(@NotNull(message = "{required}") Long folderid, MultipartFile file, HttpServletRequest request) throws FebsException {
+ public void addFilesUpload(@NotNull(message = "{required}") Long folderid, MultipartFile file) throws FebsException {
try {
this.filesUploadService.createFilesUpload(folderid, file);
} catch (Exception e) {
@@ -93,6 +93,29 @@
} catch (Exception e) {
String message = "修改FilesUpload失败";
log.error(message, e);
+ throw new FebsException(e.getMessage());
+ }
+ }
+
+ @PostMapping("/mvFiles")
+ @PreAuthorize("hasAuthority('filesUpload:mv')")
+ public void mvFiles(@NotBlank(message = "{required}") String fileids,@NotNull(message = "{required}") Long folderid) throws FebsException {
+ try {
+ this.filesUploadService.mvFiles(fileids,folderid);
+ } catch (Exception e) {
+ String message = "移动文件失败";
+ log.error(message, e);
+ 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