|
@@ -64,16 +64,11 @@ public class ExcelUtil {
|
|
if (name.startsWith("__MACOSX/")) {
|
|
if (name.startsWith("__MACOSX/")) {
|
|
continue;
|
|
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()) {
|
|
if (entry.isDirectory()) {
|
|
Files.createDirectories(entryFile.toPath());
|
|
Files.createDirectories(entryFile.toPath());
|
|
} else {
|
|
} else {
|