diff --git a/emis-oms-biz/src/main/resources/mapper/EmisRegionMapper.xml b/emis-oms-biz/src/main/resources/mapper/EmisRegionMapper.xml index 3b75279..9bc8181 100644 --- a/emis-oms-biz/src/main/resources/mapper/EmisRegionMapper.xml +++ b/emis-oms-biz/src/main/resources/mapper/EmisRegionMapper.xml @@ -18,7 +18,6 @@ - @@ -44,13 +43,22 @@ and ( - region_name like concat('%', #{regionName}, '%') - or ( region_name_en!='' and region_name_en like concat('%', #{regionName}, '%') ) - or #{regionName} like concat('%',region_name, '%') - or ( region_name_en!='' and #{regionName} like concat('%',region_name_en, '%') ) + region_name like concat('%', #{regionNameEn}, '%') + or ( region_name_en!='' and region_name_en like concat('%', #{regionNameEn}, '%') ) + or #{regionNameEn} like concat('%',region_name, '%') + or ( region_name_en!='' and #{regionNameEn} like concat('%',region_name_en, '%') ) ) + + + and ( + region_name like concat('%', #{searchValue}, '%') + or ( region_name_en!='' and region_name_en like concat('%', #{searchValue}, '%') ) + or #{searchValue} like concat('%',region_name, '%') + or ( region_name_en!='' and #{searchValue} like concat('%',region_name_en, '%') ) + ) + and region_type = #{regionType} and short_name like concat('%', #{shortName}, '%') and parent_code=#{parentCode}