diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java index 2dd6f6ba5..2df55688a 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java @@ -3807,7 +3807,7 @@ public class EmisBaseService { } EmisCountry emisCountry = new EmisCountry(); - emisCountry.setName(name); + emisCountry.getParams().put("name", name); List list=emisCountryMapper.selectEmisCountryList(emisCountry); if(!CollectionUtils.isEmpty(list)) { return list.get(0); diff --git a/emis-biz/src/main/resources/mapper/EmisCountryMapper.xml b/emis-biz/src/main/resources/mapper/EmisCountryMapper.xml index e4d98fa04..b08398fc4 100644 --- a/emis-biz/src/main/resources/mapper/EmisCountryMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisCountryMapper.xml @@ -56,6 +56,14 @@ and update_time = #{updateTime} and create_site like concat('%', #{createSite}, '%') and update_site like concat('%', #{updateSite}, '%') + + and ( + three_code = #{params.name} + or two_code = #{params.name} + or name = #{params.name} + or (name_en != '' and name_en = #{params.name}) + ) + @@ -164,4 +172,4 @@ #{id} - \ No newline at end of file +