浏览代码

Merge branch 'test' of http://112.74.196.215:3000/backend/mo-daq-all into release

wangzaijun 1 月之前
父节点
当前提交
c7a3314896
共有 1 个文件被更改,包括 5 次插入10 次删除
  1. 5 10
      mo-daq/src/main/java/com/smppw/modaq/infrastructure/util/ExcelUtil.java

+ 5 - 10
mo-daq/src/main/java/com/smppw/modaq/infrastructure/util/ExcelUtil.java

@@ -64,16 +64,11 @@ public class ExcelUtil {
                 if (name.startsWith("__MACOSX/")) {
                     continue;
                 }
-                File entryFile;
-                try {
-                    entryFile = FileUtil.file(destFilePath, name);
-                } catch (Exception e) {
-                    String zipFilename = FileUtil.getName(destFilePath);
-                    String ext = FileUtil.extName(name);
-                    name = zipFilename + "_" + i + "." + ext;
-                    entryFile = FileUtil.file(destFilePath, name);
-                    i++;
-                }
+                String zipFilename = FileUtil.getName(destFilePath);
+                String ext = FileUtil.extName(name);
+                name = zipFilename + "_" + i + "." + ext;
+                File entryFile = FileUtil.file(destFilePath, name);
+                i++;
                 if (entry.isDirectory()) {
                     Files.createDirectories(entryFile.toPath());
                 } else {