From 8223ff89eff9b2844c2b69a4f77fc1a15cd305f1 Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Wed, 24 Jul 2024 17:12:10 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=81=E6=A0=87=E5=AF=BC=E5=85=A5?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=90=8D=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../laws/common/service/impl/LawsCommonServiceImpl.java     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java
index 5f223bc0..efd89637 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java
@@ -1670,7 +1670,7 @@ public class LawsCommonServiceImpl implements ILawsCommonService {
         String moduleCode = "";
         if (tableName.equals(TableNameEnum.ENTERPRISE_STANDARDS.getTableName())) {
             // 检查Excel的文件名
-            if (!excelName.equals("企业标准法规导入模板.xls") && !excelName.contains("xlsm")) {
+            if (!excelName.contains("企业标准法规导入模板.xls") && !excelName.contains("xlsm")) {
                 FileUnZip.deleteDir(saveDirectory);
                 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())) {
             // 检查Excel的文件名
-            if (!excelName.equals("外来标准法规导入模板.xls") && !excelName.contains("xlsm")) {
+            if (!excelName.contains("外来标准法规导入模板.xls") && !excelName.contains("xlsm")) {
                 FileUnZip.deleteDir(saveDirectory);
                 throw new JeroBootException(MessageUtils.getMessage(ResultCommon.IMPORT_TEMPLATE_ERROR));
             }
@@ -2476,7 +2476,7 @@ public class LawsCommonServiceImpl implements ILawsCommonService {
         ByteArrayOutputStream baosZip = new ByteArrayOutputStream();
         try (ZipOutputStream zos = new ZipOutputStream(baosZip)) {
             // 添加第一个文件到ZIP中
-            ZipEntry entry1 = new ZipEntry("企业标准导入模板.xlsx");
+            ZipEntry entry1 = new ZipEntry("企业标准法规导入模板.xlsx");
             zos.putNextEntry(entry1);
             zos.write(mainWorkbookBytes);
             zos.closeEntry();