From ba7dd3317602beb11b35063a5aacfff3ed2266ba Mon Sep 17 00:00:00 2001
From: "Mr.Z" <709235321@qq.com>
Date: Tue, 14 Sep 2021 17:40:11 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=9C=AA=E7=AC=A6=E5=90=88=E9=A1=B9?=
 =?UTF-8?q?=E6=95=B4=E6=94=B9=E5=BA=93=E6=A0=87=E5=87=86=E5=8F=B7/?=
 =?UTF-8?q?=E6=A0=87=E5=87=86=E5=90=8D=E7=A7=B0=E6=90=9C=E7=B4=A2~?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/sarStandUnqualified/SarStandUnqualifiedMapper.xml    | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandUnqualified/SarStandUnqualifiedMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandUnqualified/SarStandUnqualifiedMapper.xml
index 117b6e2c..305cb1c0 100644
--- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandUnqualified/SarStandUnqualifiedMapper.xml
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandUnqualified/SarStandUnqualifiedMapper.xml
@@ -50,6 +50,7 @@
         </if>
         <if test="sar.standSerialNumber != null and sar.standSerialNumber != '' ">
             and STAND_SERIAL_NUMBER like concat(concat('%',#{sar.standSerialNumber}),'%')
+            or sar_stand_unqualified.STAND_NAME like concat(concat('%',#{sar.standSerialNumber}),'%')
         </if>
         limit #{start},#{end}
     </select>
@@ -73,6 +74,7 @@
         </if>
         <if test="sar.standSerialNumber != null and sar.standSerialNumber != '' ">
             and STAND_SERIAL_NUMBER like concat(concat('%',#{sar.standSerialNumber}),'%')
+            or sar_stand_unqualified.STAND_NAME like concat(concat('%',#{sar.standSerialNumber}),'%')
         </if>
     </select>
 </mapper>

From bcf47c93e1390d6c10cd6f76abb70b490767771d Mon Sep 17 00:00:00 2001
From: yuezhihang <yuezhihang@91isoft.com>
Date: Wed, 15 Sep 2021 16:34:47 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=9F=A5=E4=BA=BA=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mybatis/mapper/sarInstitution/TsInstitutionMapper.xml       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarInstitution/TsInstitutionMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarInstitution/TsInstitutionMapper.xml
index 600754b7..ba3d2104 100644
--- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarInstitution/TsInstitutionMapper.xml
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarInstitution/TsInstitutionMapper.xml
@@ -50,7 +50,7 @@
 
         <if test="userName != null">
 
-            where u.uname like concat('%','${userName}','%')
+            where u.uname like concat('%','${userName}','%') or u.account like concat('%','${userName}','%')
         </if>
     </select>