diff --git a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml index e926fee3c..e6be3b5c1 100644 --- a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml +++ b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml @@ -312,20 +312,24 @@ AND ggxh LIKE concat('%', #{ggxh}, '%') - and ( - nameCode LIKE concat('%', #{nameCode}, '%') - or ybbm LIKE concat('%', #{nameCode}, '%') - or sptm LIKE concat('%', #{nameCode}, '%')) + AND nameCode LIKE concat(#{nameCode}, '%') AND (basic_udirel.isDisable is null or basic_udirel.isDisable = false) + + + and ( + nameCode LIKE concat('%', #{unionCode}, '%') + or basic_udirel.ybbm LIKE concat('%', #{unionCode}, '%') + or basic_udirel.sptm LIKE concat('%', #{unionCode}, '%')) + 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}, '%')) AND basic_udirel.uuid = #{uuid} @@ -344,7 +348,7 @@ AND (thirdId ]]> '' or thirdId1 ]]> '' or thirdId2 ]]> '' or - thirdId3 ]]> '' or thirdId4 ]]> '') + thirdId3 ]]> '' or thirdId4 ]]> '') and basic_products.originUuid ]]> '' @@ -370,9 +374,11 @@ AND thirdId4 is NULL and basic_products.originUuid ]]> '' + AND basic_udirel.updateTime is NULL + AND basic_udirel.lockStatus = #{lockStatus}