From 9f8adf60cdfb7752f92fe4e57f3502a659b21a45 Mon Sep 17 00:00:00 2001
From: SUNJIABIN <sunjiabin0907@163.com>
Date: Wed, 8 Mar 2023 16:00:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E5=85=A5=E5=BA=93=E5=AF=B9?=
 =?UTF-8?q?=E6=A0=87=E5=87=86=E5=8F=B7=E5=92=8C=E5=90=8D=E7=A7=B0=E6=A0=A1?=
 =?UTF-8?q?=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/ActSarItemsBussEOService.java        | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsBussEOService.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsBussEOService.java
index 63dc0acd..cb18e184 100644
--- a/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsBussEOService.java
+++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsBussEOService.java
@@ -386,15 +386,7 @@ public class ActSarItemsBussEOService {
 //            attInfoMap = saveFileMsg(attInfoMap,sarStandardsInfoEO.getFileIds(),sarStandardsInfoEO.getTextStatus());
             String resData = JSON.toJSONString(attInfoMap, SerializerFeature.WriteMapNullValue);
             sarBussionessStand.setSarStandAttrEOStr(resData);
-            // 根据标准号判断数据是否已存在
             //2021年4月9日 此处检查当前是否存在standId
-            QueryWrapper<SarBussionessStand>queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq(sarBussionessStand.getStandCode() != null,"STAND_CODE",sarBussionessStand.getStandCode())
-                    .eq(sarBussionessStand.getStandName() != null,"STAND_NAME",sarBussionessStand.getStandName());
-            Integer count = iSarBussionessStandService.count(queryWrapper);
-            if (count > 0){
-                throw new AdcDaBaseException("当前企标标准号和企标名称已存在");
-            }
             String standCode = "";
             if(StringUtils.isNotBlank(sarBussionessStand.getStandCode()) && !"null".equals(sarBussionessStand.getStandCode())){
                 standCode = sarBussionessStand.getStandCode();
@@ -472,6 +464,14 @@ public class ActSarItemsBussEOService {
             } else {//标准号、ID都不存在的情况
                 //  新增方法
                 sarBussionessStand.setPrcCreateUser(prcCreateUser);
+                // 根据标准号判断数据是否已存在
+                QueryWrapper<SarBussionessStand>queryWrapper = new QueryWrapper<>();
+                queryWrapper.eq(sarBussionessStand.getStandCode() != null,"STAND_CODE",sarBussionessStand.getStandCode())
+                        .eq(sarBussionessStand.getStandName() != null,"STAND_NAME",sarBussionessStand.getStandName());
+                Integer count = iSarBussionessStandService.count(queryWrapper);
+                if (count > 0){
+                    throw new AdcDaBaseException("当前企标标准号和企标名称已存在");
+                }
                 ResponseMessage<SarBussionessStand> responseMessage = iSarBussionessStandService.createSarBussionessStand(sarBussionessStand);
                 if(responseMessage.isOk()){
                     SarBussionessStand bussionessStand = responseMessage.getData();