修改操作日志bug

src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml

@@ -312,20 +312,24 @@
                 AND ggxh LIKE concat('%', #{ggxh}, '%')
             </if>
             <if test="nameCode != '' and nameCode != null">
-                and (
-                nameCode LIKE concat('%', #{nameCode}, '%')
-                or ybbm LIKE concat('%', #{nameCode}, '%')
-                or sptm LIKE concat('%', #{nameCode}, '%'))
+                AND nameCode 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}
@@ -344,7 +348,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">
@@ -370,9 +374,11 @@
                 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>