From 4beefa4e056c995299ea6b606e202340dd14e846 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Wed, 11 Sep 2024 16:21:37 +0800
Subject: [PATCH] =?UTF-8?q?9/11=20=E8=8D=AF=E5=93=81=E5=AD=97=E5=85=B8?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml
index 954062b71..8bd35d438 100644
--- a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml
+++ b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml
@@ -611,7 +611,10 @@
                 AND supName LIKE concat('%', #{supName}, '%')
             </if>
             <if test="nameCode != '' and nameCode != null">
-                AND nameCode LIKE concat(#{nameCode}, '%')
+                AND (
+                nameCode LIKE concat('%', #{nameCode}, '%')
+                or ybbm LIKE concat('%', #{nameCode}, '%')
+                or sptm LIKE concat('%', #{nameCode}, '%'))
             </if>
             <if test="cpmctymc != '' and cpmctymc != null">
                 AND basic_products.cpmctymc LIKE concat('%', #{cpmctymc}, '%')
@@ -659,14 +662,18 @@
             <if test="filterType != null and filterType == 1">
                 AND (thirdId <![CDATA[<>]]> '' or thirdId1 <![CDATA[<>]]> '' or thirdId2 <![CDATA[<>]]> '' or
                 thirdId3 <![CDATA[<>]]> '' or thirdId4 <![CDATA[<>]]> '')
-                and basic_products.originUuid <![CDATA[<>]]> ''
+                <if test="productsType == 1">
+                    and basic_products.originUuid <![CDATA[<>]]> ''
+                </if>
             </if>
             <if test="filterType != null and filterType == 2">
                 AND basic_products.originUuid is NULL
             </if>
             <if test="filterType != null and filterType == 3">
                 AND (mainId is NULL or mainId = '')
-                and basic_products.originUuid <![CDATA[<>]]> ''
+                <if test="productsType == 1">
+                    and basic_products.originUuid <![CDATA[<>]]> ''
+                </if>
             </if>
             <if test="filterType != null and filterType == 4">
                 AND thirdId1 is NULL