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 readFileByFilename(String path,String filename) { - if (filename.contains("/")){ - filename = filename.substring(filename.lastIndexOf("/") + 1, filename.length()); - } + path = path + "/" + filename; List 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 message = importSplitItemsData(datasUpdate,menuId,unzipfilepath,infoId,cut,getSheetTableList); //删除原上传文件 FileUnZip.deleteDir(saveDirectory);