From c455d51a1977c53374401038d8a6a0d705d1b60f Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Thu, 26 Sep 2024 13:40:43 +0800
Subject: [PATCH] =?UTF-8?q?Revert=20"update=20=E5=AF=BC=E5=85=A5=E6=8B=86?=
 =?UTF-8?q?=E5=88=86=E7=BB=93=E6=9E=9C=20=E5=88=A4=E6=96=AD=E8=A1=A8?=
 =?UTF-8?q?=E6=A0=BC=E5=AF=BC=E5=85=A5=E6=A0=87=E5=87=86=E4=B8=8E=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E6=A0=87=E5=87=86=E4=B8=8D=E4=B8=80=E8=87=B4"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit ef4b91be8cb5d182363a3e0008e992346bc4cb3e.
---
 .../impl/FileSplitItemsEOServiceImpl.java      | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java
index 2ca19638..54cd5c7d 100644
--- a/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java
@@ -2017,16 +2017,18 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
                 // 判断第一条是否是标准
                 LawsDomesticStandard lawsDomesticStandard =
                         lawsDomesticStandardService.queryByStandardNumber(LawsDocumentSplit.get(0).getItemNum());
-                if (Objects.isNull(lawsDomesticStandard) || !lawsDomesticStandard.getId().equals(sarFileSplitInfoEO.getStandardId())){
-                    if (MessageUtils.getLanguage().getValue().equals(LanguageEnum.CN.getValue())) {
-                        return Result.error("表格导入标准与选择标准不一致!");
-                    } else {
-                        return Result.error("Table import criteria are inconsistent with selection criteria!");
+                if (!Objects.isNull(lawsDomesticStandard)){
+                    if (!lawsDomesticStandard.getId().equals(sarFileSplitInfoEO.getStandardId())){
+                        if (MessageUtils.getLanguage().getValue().equals(LanguageEnum.CN.getValue())) {
+                            return Result.error("表格导入标准与选择标准不一致!");
+                        } else {
+                            return Result.error("Table import criteria are inconsistent with selection criteria!");
+                        }
                     }
+                    existStandard = true;
+                    LawsDocumentSplit.get(0).setStandardId(lawsDomesticStandard.getId());
+                    LawsDocumentSplit.get(0).setFileType(sarFileSplitInfoEO.getFileType());
                 }
-                existStandard = true;
-                LawsDocumentSplit.get(0).setStandardId(lawsDomesticStandard.getId());
-                LawsDocumentSplit.get(0).setFileType(sarFileSplitInfoEO.getFileType());
                 batchSaveItems(LawsDocumentSplit);
             }
             long bb = System.currentTimeMillis();