From 3727fe5bc8e5eae3111870aea911a971904d60b8 Mon Sep 17 00:00:00 2001
From: yuezhihang <yuezhihang@91isoft.com>
Date: Fri, 29 Apr 2022 15:33:32 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=9B=B4=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/SarStandardsInfoServiceImpl.java          | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java
index 4dc6e722..e3b8172a 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java
@@ -332,6 +332,7 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
         wrapper.isNotNull("DTBJH");
         wrapper.ne("DTBJH", "");
         wrapper.eq("valid_flag", "0");
+        wrapper.eq("stand_id", "6zaj8lx8s9ebc3za0g95");
         List<SarStandAttrInfo> sarStandAttrInfos = sarStandAttrInfoEODao.selectList(wrapper);
         if (null != sarStandAttrInfos && !sarStandAttrInfos.isEmpty()) {
             //获取数据以及更新自身 新查询当前标准数据并将格式化之后的数据更新到代替标准号中
@@ -356,7 +357,7 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
                     String bdtbzh = list1.get(0).getStandNum();
 
                     //现在针对处理一波代替标准号  根据标准号找到
-                    if (dtbzh.contains(",") && !dtbzh.isEmpty() && !"".equals(dtbzh) && !dtbzh.contains("null") && !dtbzh.contains("Q/FT")) {
+                    if (dtbzh.contains(",") && !dtbzh.isEmpty() && !"".equals(dtbzh) && !dtbzh.contains("null") && !dtbzh.contains("Q/FT")  && !bdtbzh.contains("null")) {
                         //判定是不是多个
                         List<String> strings = new ArrayList<>(Arrays.asList(dtbzh.split(",")));
                         strings.forEach(s -> {
@@ -383,7 +384,7 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
                             }
                         });
 
-                    } else if (!dtbzh.isEmpty() && !"".equals(dtbzh) && !dtbzh.contains("null") && !dtbzh.contains("Q/FT")) {
+                    } else if (!dtbzh.isEmpty() && !"".equals(dtbzh) && !dtbzh.contains("null") && !dtbzh.contains("Q/FT") && !bdtbzh.contains("null")) {
                         //单个
                         SearchStandContext searchStandContext = new SearchStandContext();
                         searchStandContext.setStandCode(dtbzh);
@@ -527,7 +528,7 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
             standCode = standCode.replaceAll("、", ",");
 //            standCode = standCode.replaceAll("--", "");
 //            standCode = standCode.replaceAll("-", "");
-//            standCode = standCode.replaceAll("_", "");
+            standCode = standCode.replaceAll("null", "");
             if ("--".equals(standCode) || "-".equals(standCode) || "_".equals(standCode)) {
                 standCode = "";
             }