From 890be4f01daefbca6f085bb8314d40de282c1db8 Mon Sep 17 00:00:00 2001
From: 孔祥富 <kongxf@daryun.com>
Date: 星期五, 05 三月 2021 15:52:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpAccessoryServiceImpl.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpAccessoryServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpAccessoryServiceImpl.java
index bcd6297..a7d2986 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpAccessoryServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpAccessoryServiceImpl.java
@@ -216,7 +216,11 @@
EmpBaseInfo empBaseInfo = empBaseInfoService.getById(accessory.getEmpid());
String nameAndCertificateNumb = empBaseInfo.getEmpName()+"_"+empBaseInfo.getCertificateNumb()+"/";
files.add(new File(properties.getUploadSinglePath() + nameAndCertificateNumb + accessory.getFilesaddress()));
- fileName.add(accessory.getFilesname());
+ if ( fileName.parallelStream().filter(filter->StrUtil.equals(accessory.getFilesname(),filter)).count()==0){
+ fileName.add(accessory.getFilesname());
+ }else{
+ fileName.add(accessory.getFilesname()+fileName.parallelStream().filter(filter->StrUtil.equals(accessory.getFilesname(),filter)).count()+1);
+ }
});
MyUtil.download(request, response, files, fileName);
--
Gitblit v1.8.0