提交

孔祥富

2021-03-07 21c231798d12d9940ec872598f8fbc4f45f393fc

 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;
@@ -128,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);