From d268017fe3bf5656d83695463ae0a20edd64425e Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Tue, 2 Jul 2024 11:18:47 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=A0=87=E5=87=86=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E4=BB=A3=E6=9B=BF=E6=A0=87=E5=87=86=E5=8F=B7=E7=9A=84=E6=97=B6?=
 =?UTF-8?q?=E5=80=99=EF=BC=8C=E8=A2=AB=E4=BB=A3=E6=9B=BF=E7=9A=84=E6=A0=87?=
 =?UTF-8?q?=E5=87=86=E8=87=AA=E5=8A=A8=E5=8F=98=E4=B8=BA=E4=BD=9C=E5=BA=9F?=
 =?UTF-8?q?=20=E4=BC=81=E6=A0=87=E5=88=B6=E4=BF=AE=E8=AE=A2=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B/=E4=BC=81=E6=A0=87=E6=9B=B4=E6=94=B9=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B/=E4=BC=81=E6=A0=87=E5=BA=93=E7=BC=96=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/LawsCommonServiceImpl.java   | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 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 03c23c37..c8c3eddd 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
@@ -1062,20 +1062,20 @@ public class LawsCommonServiceImpl implements ILawsCommonService {
         String replacedStandard = (String) parameterMap.get(FieldCommon.REPLACED_STANDARD);
         // 获取标准状态
         String standardState = (String) parameterMap.get(FieldCommon.STANDARD_STATE);
+        boolean replaceFlag = true;
         // 如果标准状态不是现行有效则不处理代替标准
-        boolean replaceFlag = false;
-        if (StringUtils.isNotBlank(standardState)) {
-            // 企标需要自动拼装标准号
-            if (module.equals(TableNameEnum.ENTERPRISE_STANDARDS.getValue())) {
-                if (standardState.equals(StandardStateEnum.CURRENTLY_EFFECTIVE.getStateValue())) {
-                    replaceFlag = true;
-                }
-            } else {
-                if (standardState.equals(OutStandardStateEnum.CURRENTLY_EFFECTIVE.getStateValue())) {
-                    replaceFlag = true;
-                }
-            }
-        }
+//        boolean replaceFlag = false;
+//        if (StringUtils.isNotBlank(standardState)) {
+//            if (module.equals(TableNameEnum.ENTERPRISE_STANDARDS.getValue())) {
+//                if (standardState.equals(StandardStateEnum.CURRENTLY_EFFECTIVE.getStateValue())) {
+//                    replaceFlag = true;
+//                }
+//            } else {
+//                if (standardState.equals(OutStandardStateEnum.CURRENTLY_EFFECTIVE.getStateValue())) {
+//                    replaceFlag = true;
+//                }
+//            }
+//        }
         // 先删除已经存储的关联
         lawsReplacedStandardService.removeRelation(standardNumber, 1);
         if (StringUtils.isNotBlank(replacedStandard)) {