From 022e0c0755de490250ee6eaa31ce7df48c1a09c4 Mon Sep 17 00:00:00 2001
From: SUNJIABIN <sunjiabin0907@163.com>
Date: Thu, 6 Apr 2023 00:02:32 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=8F=90=E7=A4=BA?=
 =?UTF-8?q?=E9=9F=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/ActSarItemsBussEOService.java     | 30 ++++++++++++++-----
 .../impl/SarBussionessStandServiceImpl.java   |  2 +-
 2 files changed, 24 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 cb18e184..9b779afd 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
@@ -391,6 +391,22 @@ public class ActSarItemsBussEOService {
             if(StringUtils.isNotBlank(sarBussionessStand.getStandCode()) && !"null".equals(sarBussionessStand.getStandCode())){
                 standCode = sarBussionessStand.getStandCode();
             }
+
+            QueryWrapper<SarBussionessStand>queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq(sarBussionessStand.getStandCode() != null,"STAND_CODE",sarBussionessStand.getStandCode())
+                    .eq(sarBussionessStand.getStandName() != null,"STAND_NAME",sarBussionessStand.getStandName());
+            List<SarBussionessStand> list = iSarBussionessStandService.list(queryWrapper);
+            Integer valIdFlag = 0;
+            for (SarBussionessStand stand :list){
+                if ((list.size() ==1 && !list.get(0).getId().equals(stand.getId())) || list.size() >1){
+                    valIdFlag = stand.getValidFlag();
+                    if (valIdFlag == 0){
+                        logger.info("企标标准号"+ sarBussionessStand.getStandCode() +"或企标名称"+ sarBussionessStand.getStandName() +"已存在");
+                        throw new AdcDaBaseException("企标标准号"+ sarBussionessStand.getStandCode() +"或企标名称"+ sarBussionessStand.getStandName() +"已存在");
+                    }
+                }
+            }
+
             List<SarBussionessStand> lawsList = iSarBussionessStandService.selectStandardsByStandNumber(standCode);
 //            if (StringUtils.isBlank(sarStandardsInfoEO.getMenuId()) && "INLAND".equals(sarStandardsInfoEO.getStandType())) {
 //                sarStandardsInfoEO.setMenuId("64df1d5522bb49c09af2");
@@ -465,13 +481,13 @@ public class ActSarItemsBussEOService {
                 //  新增方法
                 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("当前企标标准号和企标名称已存在");
-                }
+//                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();
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java
index cd091a2a..428f31a1 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java
@@ -2776,7 +2776,7 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
                              }
                          } catch (Exception e) {
                              FileUnZip.deleteDir(saveDirectory);
-                             return Result.error("导入失败,需要导入的数据有问题或导入的企标标号或企标名称重复");
+                             return Result.error("导入失败,需要导入的数据有问题或导入的企标标号和企标名称已存在");
                          }
                      }
                  }

From 291604a9bfbba1e0b2650cf44a13514aee6b8e51 Mon Sep 17 00:00:00 2001
From: SUNJIABIN <sunjiabin0907@163.com>
Date: Thu, 6 Apr 2023 01:45:03 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BC=81=E6=A0=87?=
 =?UTF-8?q?=E5=AF=BC=E5=85=A5=E8=B5=B7=E8=8D=89=E4=BA=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/SarBussionessStandServiceImpl.java             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java
index 428f31a1..73de1017 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java
@@ -2425,12 +2425,12 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
 
 
                                                  String qcrbuss = rowList.get("起草人");
+                                                 if (StringUtils.isNotBlank(qcrbuss)){
                                                  String[] split3 = qcrbuss.split(",");
                                                  String account = "";
                                                  String str = "";
                                                  String qcr = "";
                                                  String qcrs = "";
-                                                 if (StringUtils.isNotBlank(qcrbuss)){
                                                      for (int j = 0; j < split3.length; j++) {
                                                          str = split3[j];
                                                          account = tsUserDao.selectByAccount(str);