QR/laws_chery_serve
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 87510 企业标准-导入-压缩包内多个Excel，提示信息需修改

Browse Source
This commit is contained in:
mzaxd
2024-07-25 11:38:01 +08:00
parent b961564c10
commit 3a60ac69b8
6 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java
+2 -2
View File
@@ -1656,13 +1656,13 @@ public class LawsCommonServiceImpl implements ILawsCommonService {
throw new JeroBootException(MessageUtils.getMessage(ResultCommon.IMPORT_TEMPLATE_ERROR));
} else if (fileList.size() > 1) {
FileUnZip.deleteDir(saveDirectory);
throw new JeroBootException(MessageUtils.getMessage(ResultCommon.IMPORT_TEMPLATE_ERROR));
throw new JeroBootException(MessageUtils.getMessage(ResultCommon.ZIP_ROOT_ONE_EXCEL));
}
List<File> excelfilelist = FileUnZip.readImpExcelFile(saveDirectory.getPath());
System.gc();
if (excelfilelist.size() != 1) {
FileUnZip.deleteDir(saveDirectory);
throw new JeroBootException(MessageUtils.getMessage(ResultCommon.IMPORT_TEMPLATE_ERROR));
throw new JeroBootException(MessageUtils.getMessage(ResultCommon.ZIP_ROOT_ONE_EXCEL));
}
String excelName = excelfilelist.get(0).getName();
String moduleCode = "";
laws-modules/src/main/java/com/jero/modules/split/common/FileUnZip.java
+2 -2
View File
@@ -291,8 +291,8 @@ public class FileUnZip {
for (File fi : files) {
// 对文件进行过滤，只读取Excel文件
String name = fi.getName();
// "导入模板".equals(fi.getName()) || "导入模板.xlsx".equals(fi.getName())
if (name != null &&( fi.getName().contains(".xls") || fi.getName().contains(".xlsx") )){
if (fi.getName().contains(".xls") || fi.getName().contains(".xlsx")
|| fi.getName().contains(".xlsm")){
resultlist.add(fi);
}
}