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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
yjz
2024-07-24 17:14:37 +08:00
parent 22e642648d 8223ff89ef
commit 94861216dc
1 changed files with 3 additions and 3 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
+3 -3
View File
@@ -1670,7 +1670,7 @@ public class LawsCommonServiceImpl implements ILawsCommonService {
String moduleCode = ""; String moduleCode = "";
if (tableName.equals(TableNameEnum.ENTERPRISE_STANDARDS.getTableName())) { if (tableName.equals(TableNameEnum.ENTERPRISE_STANDARDS.getTableName())) {
// 检查Excel的文件名 // 检查Excel的文件名
if (!excelName.equals("企业标准法规导入模板.xls") && !excelName.contains("xlsm")) { if (!excelName.contains("企业标准法规导入模板.xls") && !excelName.contains("xlsm")) {
FileUnZip.deleteDir(saveDirectory); FileUnZip.deleteDir(saveDirectory);
throw new JeroBootException(MessageUtils.getMessage(ResultCommon.IMPORT_TEMPLATE_ERROR)); throw new JeroBootException(MessageUtils.getMessage(ResultCommon.IMPORT_TEMPLATE_ERROR));
} }
@@ -1678,7 +1678,7 @@ public class LawsCommonServiceImpl implements ILawsCommonService {
} }
if (tableName.equals(TableNameEnum.DOMESTIC_REGULATIONS.getTableName())) { if (tableName.equals(TableNameEnum.DOMESTIC_REGULATIONS.getTableName())) {
// 检查Excel的文件名 // 检查Excel的文件名
if (!excelName.equals("外来标准法规导入模板.xls") && !excelName.contains("xlsm")) { if (!excelName.contains("外来标准法规导入模板.xls") && !excelName.contains("xlsm")) {
FileUnZip.deleteDir(saveDirectory); FileUnZip.deleteDir(saveDirectory);
throw new JeroBootException(MessageUtils.getMessage(ResultCommon.IMPORT_TEMPLATE_ERROR)); throw new JeroBootException(MessageUtils.getMessage(ResultCommon.IMPORT_TEMPLATE_ERROR));
} }
@@ -2476,7 +2476,7 @@ public class LawsCommonServiceImpl implements ILawsCommonService {
ByteArrayOutputStream baosZip = new ByteArrayOutputStream(); ByteArrayOutputStream baosZip = new ByteArrayOutputStream();
try (ZipOutputStream zos = new ZipOutputStream(baosZip)) { try (ZipOutputStream zos = new ZipOutputStream(baosZip)) {
// 添加第一个文件到ZIP中 // 添加第一个文件到ZIP中
ZipEntry entry1 = new ZipEntry("企业标准导入模板.xlsx"); ZipEntry entry1 = new ZipEntry("企业标准法规导入模板.xlsx");
zos.putNextEntry(entry1); zos.putNextEntry(entry1);
zos.write(mainWorkbookBytes); zos.write(mainWorkbookBytes);
zos.closeEntry(); zos.closeEntry();