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}, '%') - AND nameCode LIKE concat(#{nameCode}, '%') + AND ( + nameCode LIKE concat('%', #{nameCode}, '%') + or ybbm LIKE concat('%', #{nameCode}, '%') + or sptm LIKE concat('%', #{nameCode}, '%')) AND basic_products.cpmctymc LIKE concat('%', #{cpmctymc}, '%') @@ -659,14 +662,18 @@ AND (thirdId ]]> '' or thirdId1 ]]> '' or thirdId2 ]]> '' or thirdId3 ]]> '' or thirdId4 ]]> '') - and basic_products.originUuid ]]> '' + + and basic_products.originUuid ]]> '' + AND basic_products.originUuid is NULL AND (mainId is NULL or mainId = '') - and basic_products.originUuid ]]> '' + + and basic_products.originUuid ]]> '' + AND thirdId1 is NULL