From 23f233e14c297b4d08a557bce3bbfe52624bf5ff Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Fri, 5 Jan 2024 16:42:07 +0800
Subject: [PATCH] =?UTF-8?q?fix:=2080455=20=E4=BC=81=E4=B8=9A=E6=A0=87?=
 =?UTF-8?q?=E5=87=86-=E5=AF=BC=E5=85=A5=EF=BC=8C=E5=AF=BC=E5=85=A5?=
 =?UTF-8?q?=E6=9C=AA=E5=A1=AB=E5=86=99=E6=A0=87=E5=87=86=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E7=9A=84=E6=96=87=E4=BB=B6=EF=BC=8C=E6=8F=90=E7=A4=BA=E5=AE=83?=
 =?UTF-8?q?=E6=98=AF=E5=BF=85=E5=A1=AB=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../laws/common/service/impl/LawsCommonServiceImpl.java    | 4 ++--
 .../java/com/jero/modules/laws/common/util/ImportUtil.java | 7 ++++---
 2 files changed, 6 insertions(+), 5 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 efc21178..2cd13a5b 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
@@ -1484,7 +1484,7 @@ public class LawsCommonServiceImpl implements ILawsCommonService {
             String tableName = TableNameEnum.getTableName(module);
             List<String> errorMsgsList = this.validDataFormat(insertDataList, file, tableName);
             // 判断如果校验有问题则返回校验错误信息，没问题则将数据转化为导入方法所需参数
-            if (errorMsgsList.size() > 0) {
+            if (!errorMsgsList.isEmpty()) {
                 return errorMsgsList;
             } else {
                 // 执行新增功能
@@ -1564,7 +1564,7 @@ public class LawsCommonServiceImpl implements ILawsCommonService {
                 fileList.add(file1);
             }
         }
-        if (fileList.size() == 0) {
+        if (fileList.isEmpty()) {
             FileUnZip.deleteDir(saveDirectory);
             throw new JeroBootException(MessageUtils.getMessage(ResultCommon.IMPORT_TEMPLATE_ERROR));
         } else if (fileList.size() > 1) {
diff --git a/laws-modules/src/main/java/com/jero/modules/laws/common/util/ImportUtil.java b/laws-modules/src/main/java/com/jero/modules/laws/common/util/ImportUtil.java
index 83fd9904..a33eda66 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/common/util/ImportUtil.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/common/util/ImportUtil.java
@@ -122,10 +122,11 @@ public class ImportUtil {
                 // 将国标和外标的三个标准号组成元素取出
                 if (!standardValidFlag) {
                     if ((TableNameEnum.DOMESTIC_REGULATIONS.getValue().equals(tag.getIsModel()) ||
-                            TableNameEnum.FOREIGN_REGULATIONS.getValue().equals(tag.getIsModel())) &&
-                            FieldCommon.STANDARD_NUMBER_TEMP.equals(tag.getDbFieldName()) ||
+                            TableNameEnum.FOREIGN_REGULATIONS.getValue().equals(tag.getIsModel()))
+                                                        &&
+                            (FieldCommon.STANDARD_NUMBER_TEMP.equals(tag.getDbFieldName()) ||
                             FieldCommon.STANDARD_CLASS.equals(tag.getDbFieldName()) ||
-                            FieldCommon.YEAR_NUMBER.equals(tag.getDbFieldName())
+                            FieldCommon.YEAR_NUMBER.equals(tag.getDbFieldName()))
                     ) {
                         if (FieldCommon.STANDARD_NUMBER_TEMP.equals(tag.getDbFieldName())) {
                             if (cell == null) {