From 989688d87fb5aa573b38648bba5ad47509eab482 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Thu, 16 Jun 2022 12:34:28 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=87=E6=A1=A3=E5=BA=93--=E5=AF=BC=E5=85=A5?=
 =?UTF-8?q?,=E6=A8=A1=E6=9D=BF=E4=B8=8B=E8=BD=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/BussDocumentLibraryEOServiceImpl.java      | 6 +++---
 .../main/java/com/jero/modules/split/common/FileUnZip.java  | 4 ++--
 2 files changed, 5 insertions(+), 5 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 595f18294..851b075ba 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
@@ -4399,10 +4399,10 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
         if (fileList.size() != 0) {
             //文件
             if(CutEnum.CN.getValue().equals(cut)){
-                String file = StringUtils.join(fileList, ",") + "字段为文件属性,填写时需要在本文件同级目录下以标准号为名称建立文件夹,并在文件夹下放置文件,假设在AAA标准号下放置了B.pdf,则应填写AAA/B.pdf\n";
+                String file = StringUtils.join(fileList, ",") + "字段为文件属性,填写时需要在本文件同级目录下以标准号为名称建立文件夹,并在文件夹下放置文件且该文件夹下只能有一层级,假设在AAA标准号下放置了B.pdf,则应填写AAA/B.pdf\n";
                 sbTwo.append(count++ + "." + file);
             }else{
-                String file = StringUtils.join(fileList, ",") + " When filling in the field, you need to create a folder in the directory of the same level as the file with the name of the standard number and place the file in the folder. Assume that the file is saved in the AAA standard numberB.pdf,Should fill inAAA/B.pdf\n";
+                String file = StringUtils.join(fileList, ",") + " When filling in the field, you need to create a folder in the directory of the same level as the file with the name of the standard number and place the file in the folder and can be only one level under this folder, Assume that the file is saved in the AAA standard numberB.pdf,Should fill inAAA/B.pdf\n";
                 sbTwo.append(count++ + "." + file);
             }
         }
@@ -5280,7 +5280,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
                                     List<File> nowFileList = FileUnZip.readFileByFilename(zipEntryName, fileName,cut,errorMsg,null,key,key);
                                     if (nowFileList.size() == 0) {
                                         if(CutEnum.CN.getValue().equals(cut)){
-                                            errorMsg += key + "压缩包中没有" + fileName + "文件, ";
+                                            errorMsg += key + "  压缩包中没有" + fileName + "文件, ";
                                         }else{
                                             errorMsg += key + " Not in the zip package" + fileName + "file, ";
                                         }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/common/FileUnZip.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/common/FileUnZip.java
index 9962c9ba9..c51c2c55a 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/common/FileUnZip.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/common/FileUnZip.java
@@ -136,8 +136,8 @@ public class FileUnZip {
         String filenameOne = "";
         String filenameTwo = "";
         if(filename.contains("/")){
-            filenameOne = filename.split("/")[0];
-            filenameTwo = filename.split("/")[1];
+            filenameOne = filename.split("/")[1];
+            filenameTwo = filename.split("/")[2];
         }
         List<File> resultlist = new ArrayList<>();
         if (StringUtil.isNotEmpty(path)){