From 4e52cb2253af9a22571c7d0c239ee283178d2fd4 Mon Sep 17 00:00:00 2001
From: 孔祥富 <kongxf@daryun.com>
Date: 星期一, 08 三月 2021 10:05:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/FilesUploadServiceImpl.java | 27 ++++++++++++++++-----------
1 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/FilesUploadServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/FilesUploadServiceImpl.java
index 53e37dd..6243db0 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/FilesUploadServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/FilesUploadServiceImpl.java
@@ -2,6 +2,7 @@
import java.io.*;
import java.util.*;
+import java.util.stream.Collectors;
import cc.mrbird.febs.common.core.constant.ModuleCode;
import cc.mrbird.febs.common.core.exception.FebsException;
@@ -108,11 +109,10 @@
String[] arr = fileids.split(",");
LambdaUpdateWrapper<FilesUpload> wapper = new LambdaUpdateWrapper<>();
wapper.in(FilesUpload::getFilesid, arr);
- FilesUpload filesUpload = new FilesUpload();
- filesUpload.setModifier(operatorId);
- filesUpload.setModifytime(new Date());
- filesUpload.setDelFlag(1);
- this.update(filesUpload,wapper);
+ wapper.set(FilesUpload::getDelFlag,1);
+ wapper.set(FilesUpload::getModifier,operatorId);
+ wapper.set(FilesUpload::getModifytime,new Date());
+ this.update(wapper);
LambdaQueryWrapper<FilesUpload> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.in(FilesUpload::getFilesid, arr);
@@ -129,11 +129,17 @@
String[] arr = fileids.split(",");
List<File> files = new ArrayList<>();
List<String> fileName = new ArrayList<>();
+
Arrays.stream(arr).forEach(i -> {
FilesUpload filesUpload = this.getById(i);
Folder folder = iFolderService.getById(filesUpload.getFolderid());
files.add(new File(properties.getUploadCommonPath() + folder.getFoldername() + "/" + filesUpload.getFilesaddress()));
- fileName.add(filesUpload.getFilesname());
+ if ( fileName.parallelStream().filter(filter->StrUtil.equals(filesUpload.getFilesname(),filter)).count()==0){
+ fileName.add(filesUpload.getFilesname());
+ }else{
+ fileName.add(filesUpload.getFilesname()+fileName.parallelStream().filter(filter->StrUtil.equals(filesUpload.getFilesname(),filter)).count()+1);
+ }
+
});
MyUtil.download(request, response, files, fileName);
@@ -156,11 +162,10 @@
LambdaUpdateWrapper<FilesUpload> wapper = new LambdaUpdateWrapper<>();
wapper.in(FilesUpload::getFilesid, arr);
- FilesUpload filesUpload = new FilesUpload();
- filesUpload.setModifier(operatorId);
- filesUpload.setModifytime(new Date());
- filesUpload.setFolderid(folderid);
- this.update(filesUpload,wapper);
+ wapper.set(FilesUpload::getFolderid,fileids);
+ wapper.set(FilesUpload::getModifier,operatorId);
+ wapper.set(FilesUpload::getModifytime,new Date());
+ this.update(wapper);
}
--
Gitblit v1.8.0