From fd1cbe8a7921f47acb659ce16f74a77e126f23b7 Mon Sep 17 00:00:00 2001
From: yuezhihang <yuezhihang@91isoft.com>
Date: Mon, 14 Mar 2022 17:08:23 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=B7=E5=A4=96-=E6=9F=A5=E7=9C=8B-=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=E6=B6=88=E6=81=AF=EF=BC=8C=E6=B8=85=E5=8D=95=E7=94=B1?=
 =?UTF-8?q?=E6=98=AF=E6=94=B9=E4=B8=BA=E5=90=A6=E7=9A=84=E6=97=B6=E5=80=99?=
 =?UTF-8?q?=EF=BC=8C=E6=B8=85=E5=8D=95=E8=AE=B0=E5=BD=95=E7=9A=842?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SarStandardsInfoController.java           | 24 ++++++++++++++++---
 .../impl/SarStandardsInfoServiceImpl.java     |  7 ++++++
 .../SarStandardsInfoMapper.xml                |  2 +-
 3 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java
index 437de305..9a3ba52b 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java
@@ -98,7 +98,13 @@ public class SarStandardsInfoController extends BaseController<SarStandardsInfo>
 
         if (StringUtils.isNotBlank(page.getAdvanceSearchVOStr())) {
             List<SarAdvanceSearchVO> searchList = JSONObject.parseArray(page.getAdvanceSearchVOStr(),SarAdvanceSearchVO.class);
-            String advanceStr = SarAdvanceSearchUtil.createStandSql(searchList,"SAR_STAND_ATTR_INFO");
+            //不改传参强行置换
+            searchList.forEach(sarAdvanceSearchVO -> {
+                if ("TXLB".equals(sarAdvanceSearchVO.getField())){
+                    sarAdvanceSearchVO.setField("STAND_SYSTEM");
+                }
+            });
+            String advanceStr = SarAdvanceSearchUtil.createStandSql(searchList,"sar_standards_info");
             if (StringUtils.isNotBlank(advanceStr)) {
                 page.setAdvanceSearchStr(advanceStr);
             } else {
@@ -136,7 +142,13 @@ public class SarStandardsInfoController extends BaseController<SarStandardsInfo>
 
         if (StringUtils.isNotBlank(page.getAdvanceSearchVOStr())) {
             List<SarAdvanceSearchVO> searchList = JSONObject.parseArray(page.getAdvanceSearchVOStr(),SarAdvanceSearchVO.class);
-            String advanceStr = SarAdvanceSearchUtil.createStandSql(searchList,"SAR_STAND_ATTR_INFO");
+            //不改传参强行置换
+            searchList.forEach(sarAdvanceSearchVO -> {
+                if ("TXLB".equals(sarAdvanceSearchVO.getField())){
+                    sarAdvanceSearchVO.setField("STAND_SYSTEM");
+                }
+            });
+            String advanceStr = SarAdvanceSearchUtil.createStandSql(searchList,"sar_standards_info");
             if (StringUtils.isNotBlank(advanceStr)) {
                 page.setAdvanceSearchStr(advanceStr);
             } else {
@@ -215,7 +227,13 @@ public class SarStandardsInfoController extends BaseController<SarStandardsInfo>
 
         if (StringUtils.isNotBlank(page.getAdvanceSearchVOStr())) {
             List<SarAdvanceSearchVO> searchList = JSONObject.parseArray(page.getAdvanceSearchVOStr(),SarAdvanceSearchVO.class);
-            String advanceStr = SarAdvanceSearchUtil.createStandSql(searchList,"SAR_STAND_ATTR_INFO");
+            //不改传参强行置换
+            searchList.forEach(sarAdvanceSearchVO -> {
+                if ("TXLB".equals(sarAdvanceSearchVO.getField())){
+                    sarAdvanceSearchVO.setField("STAND_SYSTEM");
+                }
+            });
+            String advanceStr = SarAdvanceSearchUtil.createStandSql(searchList,"sar_standards_info");
             if (StringUtils.isNotBlank(advanceStr)) {
                 page.setAdvanceSearchStr(advanceStr);
             } else {
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 679bd783..62ba2ef9 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
@@ -1618,6 +1618,13 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
         if (StringUtils.isNotBlank(attrStr)) {
             newMap = JSONObject.fromObject(attrStr);
         }
+        //更新日志bug修复
+        Map<String,String> map=new HashMap<>();
+        map.put("1","是");
+        map.put("2","否");
+        sarStandardsInfoEO.setIsRelateAccess(map.get(sarStandardsInfoEO.getIsRelateAccess()));
+        beforeSarStandardsInfo.setIsRelateAccess(map.get(beforeSarStandardsInfo.getIsRelateAccess()));
+
         newMap = changeMap(sarStandardsInfoEO, newMap);
         oldMap = changeMap(beforeSarStandardsInfo, oldMap);
         // 增加关联事件
diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml
index cc61e967..ab21d3e4 100644
--- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml
@@ -1118,7 +1118,7 @@
             <if test="page.applyArctic != null and page.applyArctic != ''">
                 and SAR_STAND_ATTR_INFO.CLLX = #{page.applyArctic}
             </if>
-            <if test="page.advanceSearchStr != null and page.advanceSearchStr != ''">
+            <if test="null != page.advanceSearchStr  and page.advanceSearchStr != ''">
                 and (${page.advanceSearchStr})
             </if>
         </trim>