From a3f6e17d8bd750130fe4c7e991f4b7342ff7baed Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Tue, 22 Mar 2022 16:53:41 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=87=E6=A1=A3=E5=BA=93--=E5=B8=A6=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BussDocumentLibraryEOServiceImpl.java     | 24 ++++++++++++-------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java
index d87d60920..8361623b9 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java
@@ -2310,12 +2310,6 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
                     if (StringUtils.isBlank((String) data.get("serial_number"))) {
                         continue;
                     }
-                    String fileNowPath = uploadpath + "/tempZip/" + (String) data.get("serial_number");
-                    File file = new File(fileNowPath);
-                    if (file.exists()) {
-                        file.delete();
-                    }
-                    file.mkdirs();
                     List<String> valueList = new ArrayList<>();
                     for (String field : fileFieldList) {
                         String value = (String) data.get(field);
@@ -2323,12 +2317,24 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
                             valueList.add(value);
                         }
                     }
+                    String serialNumber = (String) data.get("serial_number");
+                    if(serialNumber.contains("/")){
+                        serialNumber = serialNumber.replace("/","-");
+                    }
                     //每一个编号下的所有的文件
                     if (valueList.size() != 0) {
                         List<OSSFile> fileInfosList = iOSSFileService.getFileInfosByConnectId(StringUtils.join(valueList, ","));
-                        for (OSSFile ossFile : fileInfosList) {
-                            String url = ossFile.getUrl();
-                            copyFile(url, fileNowPath + File.separator + ossFile.getFileName());
+                        if(fileInfosList.size() != 0){
+                            String fileNowPath = uploadpath + "/tempZip/" + serialNumber;
+                            File file = new File(fileNowPath);
+                            if (file.exists()) {
+                                file.delete();
+                            }
+                            file.mkdirs();
+                            for (OSSFile ossFile : fileInfosList) {
+                                String url = ossFile.getUrl();
+                                copyFile(url, fileNowPath + File.separator + ossFile.getFileName());
+                            }
                         }
                     }
                 }