From c174143dd8401221da9b8f0e3cf4b88c28c63c42 Mon Sep 17 00:00:00 2001
From: yjz <3131811435@qq.com>
Date: Wed, 7 Aug 2024 09:57:01 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=96=87=E6=A1=A3=E6=8B=86=E5=88=86):=20?=
 =?UTF-8?q?=E8=AF=86=E5=88=AB=E6=96=87=E4=BB=B6=E8=B7=AF=E5=BE=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/jero/modules/split/common/FileUnZip.java | 16 +++++-----------
 .../impl/FileSplitItemsEOServiceImpl.java        |  2 +-
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/split/common/FileUnZip.java b/laws-modules/src/main/java/com/jero/modules/split/common/FileUnZip.java
index 26f6447c..0ef85aea 100644
--- a/laws-modules/src/main/java/com/jero/modules/split/common/FileUnZip.java
+++ b/laws-modules/src/main/java/com/jero/modules/split/common/FileUnZip.java
@@ -242,20 +242,14 @@ public class FileUnZip {
      * @return
      */
     public static List<File> readFileByFilename(String path,String filename) {
-        if (filename.contains("/")){
-            filename = filename.substring(filename.lastIndexOf("/") + 1, filename.length());
-        }
+        path = path + "/" + filename;
         List<File> resultlist = new ArrayList<>();
         if (StringUtil.isNotEmpty(path)){
             File file = new File(path);
-            if (file.isDirectory()) {
-                File[] files = file.listFiles();
-                for (File fi : files) {
-                    // 对文件进行过滤
-                    if (fi.getName().equals(filename)) {
-                        resultlist.add(fi);
-                    }
-                }
+            String[] splitFilename = filename.split("/");
+            filename = splitFilename[splitFilename.length - 1];
+            if (file.isFile() && file.getName().equals(filename)) {
+                resultlist.add(file);
             }
         }
         return resultlist;
diff --git a/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java
index 94b89f48..843bcd70 100644
--- a/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java
@@ -1879,7 +1879,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
                             i = 0;
                             datasUpdate.add(sarStandImportDto);
                         }
-                        String unzipfilepath  = zipEntryName + File.separator + "附件";
+                        String unzipfilepath  = zipEntryName;
                         Result<?> message = importSplitItemsData(datasUpdate,menuId,unzipfilepath,infoId,cut,getSheetTableList);
                         //删除原上传文件
                         FileUnZip.deleteDir(saveDirectory);