From 9e43e3a7c50910814e35792a072aa05d0d793380 Mon Sep 17 00:00:00 2001
From: Superman_Main <396572590@qq.com>
Date: Thu, 18 Nov 2021 14:49:48 +0800
Subject: [PATCH 1/2] feat: There is no way the,

---
 .../mapper/sarStandardsInfo/SarStandardsInfoMapper.xml      | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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 b3792ef9..8dbe6b55 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
@@ -754,9 +754,9 @@
             <!-- 标准编号111 -->
             <if test="page.standNumber != null and page.standNumber != ''">
                 and (
-                (concat(SAR_STANDARDS_INFO.STAND_SORT,' ',SAR_STANDARDS_INFO.STAND_NUMBER,'-',
-                SAR_STANDARDS_INFO.STAND_YEAR) like concat(concat('%',#{page.standNumber}),'%') and SAR_STANDARDS_INFO.STAND_YEAR != '')
-                or (concat(SAR_STANDARDS_INFO.STAND_SORT,' ',SAR_STANDARDS_INFO.STAND_NUMBER) like concat(concat('%',#{page.standNumber}),'%')
+                (trim(replace(concat(SAR_STANDARDS_INFO.STAND_SORT,' ',SAR_STANDARDS_INFO.STAND_NUMBER,'-',
+                SAR_STANDARDS_INFO.STAND_YEAR),' ','')) like trim(replace(concat(concat('%',#{page.standNumber}),'%'),' ','')) and SAR_STANDARDS_INFO.STAND_YEAR != '')
+                or (trim(replace(concat(SAR_STANDARDS_INFO.STAND_SORT,' ',SAR_STANDARDS_INFO.STAND_NUMBER),' ','')) like trim(replace(concat(concat('%',#{page.standNumber}),'%'),' ',''))
                 and SAR_STANDARDS_INFO.STAND_YEAR = '')
                 or (stand_name like concat(concat('%',#{page.standNumber}),'%'))
                 )

From 04aa88fffaee054a12d5590e074d9052d7066a25 Mon Sep 17 00:00:00 2001
From: Superman_Main <396572590@qq.com>
Date: Fri, 19 Nov 2021 14:53:21 +0800
Subject: [PATCH 2/2] feat: There is no way the,

---
 .../mapper/sarStandardsInfo/SarStandardsInfoMapper.xml      | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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 335ed3f3..883b7e4c 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
@@ -995,9 +995,9 @@
         <if test="mark == 999 ">
             and  sar_standards_info.ID in (select distinct stand_id from sar_stand_items)
         </if>
-        <if test='page.orderByA != null and page.orderByA != "" and page.order1 != null and page.order1 != ""
-         and page.standType != null and page.standType != "" '>
-          <include refid="standSort_in"/>
+        <if test='(page.orderByA != null and page.orderByA != "" and page.order1 != null and page.order1 != "")
+         or (page.standType != null and page.standType != "") '>
+            <include refid="standSort_in"/>
         </if>
         limit ${page.pager.startIndex-1},${page.pageSize}
     </select>