9/11 药品字典优化

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