Merge remote-tracking branch 'origin/dev_third_stage' into dev_third_stage

2022-07-13 15:44:03 +08:00
parent a813e55f09 d4d359dc6b
commit a8d45fe7c3
2 changed files with 2 additions and 3 deletions
@@ -198,7 +198,7 @@ public class FileUnZip {
                        File[] filesTemp = fi.listFiles();
                        for (File fileTemp : filesTemp) {
                            // 对文件进行过滤
-                            if (fileTemp.getName().equals(filenameTwo) && fileTemp.getPath().contains(filenameOne) && StringUtils.isNotBlank(filenameOne)) {
+                            if (fileTemp.getName().equals(filenameTwo) && fi.getName().equals(filenameOne) && StringUtils.isNotBlank(filenameOne)) {
                                resultlist.add(fileTemp);
                            }
                        }