From c3c648eeb996d2a4721f8425857b9214df599d0c Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Mon, 27 Feb 2023 16:39:33 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=93=8D=E4=BD=9C=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mybatis/mapper/basic/UdiRelevanceDao.xml  | 29 +++++++++----------
 1 file changed, 13 insertions(+), 16 deletions(-)

diff --git a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml
index e6be3b5c1..e06c6e01b 100644
--- a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml
+++ b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml
@@ -305,31 +305,30 @@
             <if test="supName != '' and supName != null">
                 AND supName LIKE concat('%', #{supName}, '%')
             </if>
+            <if test="nameCode != '' and nameCode != null">
+                AND nameCode LIKE concat(#{nameCode}, '%')
+            </if>
             <if test="cpmctymc != '' and cpmctymc != null">
                 AND cpmctymc LIKE concat('%', #{cpmctymc}, '%')
             </if>
             <if test="ggxh != '' and ggxh != null">
                 AND ggxh LIKE concat('%', #{ggxh}, '%')
             </if>
-            <if test="nameCode != '' and nameCode != null">
-                AND nameCode LIKE concat(#{nameCode}, '%')
+            <if test="unionCode != '' and unionCode != null">
+                and (
+                nameCode LIKE concat('%', #{nameCode}, '%')
+                or ybbm LIKE concat('%', #{nameCode}, '%')
+                or sptm LIKE concat('%', #{nameCode}, '%'))
             </if>
             <if test="isDisable == false">
                 AND (basic_udirel.isDisable is null or basic_udirel.isDisable = false)
             </if>
-
-            <if test="unionCode != '' and unionCode != null">
-                and (
-                nameCode LIKE concat('%', #{unionCode}, '%')
-                or basic_udirel.ybbm LIKE concat('%', #{unionCode}, '%')
-                or basic_udirel.sptm LIKE concat('%', #{unionCode}, '%'))
-            </if>
             <if test="thrPiId != '' and thrPiId != null">
                 and (thirdId LIKE concat('%', #{thrPiId}, '%')
-                or thirdId1 LIKE concat('%', #{thrPiId}, '%')
-                or thirdId2 LIKE concat('%', #{thrPiId}, '%')
-                or thirdId3 LIKE concat('%', #{thrPiId}, '%')
-                or thirdId4 LIKE concat('%', #{thrPiId}, '%'))
+                    or thirdId1 LIKE concat('%', #{thrPiId}, '%')
+                    or thirdId2 LIKE concat('%', #{thrPiId}, '%')
+                    or thirdId3 LIKE concat('%', #{thrPiId}, '%')
+                    or thirdId4 LIKE concat('%', #{thrPiId}, '%'))
             </if>
             <if test="uuid != '' and uuid != null">
                 AND basic_udirel.uuid = #{uuid}
@@ -348,7 +347,7 @@
             </if>
             <if test="filterType != null and filterType == 1">
                 AND (thirdId <![CDATA[<>]]> '' or thirdId1 <![CDATA[<>]]> '' or thirdId2 <![CDATA[<>]]> '' or
-                thirdId3 <![CDATA[<>]]> '' or thirdId4 <![CDATA[<>]]> '')
+                     thirdId3 <![CDATA[<>]]> '' or thirdId4 <![CDATA[<>]]> '')
                 and basic_products.originUuid <![CDATA[<>]]> ''
             </if>
             <if test="filterType != null and filterType == 2">
@@ -374,11 +373,9 @@
                 AND thirdId4 is NULL
                 and basic_products.originUuid <![CDATA[<>]]> ''
             </if>
-
             <if test="filterType != null and filterType == 10">
                 AND basic_udirel.updateTime is NULL
             </if>
-
             <if test="lockStatus != '' and lockStatus != null">
                 AND basic_udirel.lockStatus = #{lockStatus}
             </if>