aike/emis-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'demand: 鲁泰对接bug修复' (#297) from aike into master

Browse Source 
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/297
This commit is contained in:
heyu 2026-01-15 17:11:17 +08:00
commit 63fc649292
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
View File

@ -3807,7 +3807,7 @@ public class EmisBaseService {
} }
EmisCountry emisCountry = new EmisCountry(); EmisCountry emisCountry = new EmisCountry();
emisCountry.setName(name); emisCountry.getParams().put("name", name);
List<EmisCountry> list=emisCountryMapper.selectEmisCountryList(emisCountry); List<EmisCountry> list=emisCountryMapper.selectEmisCountryList(emisCountry);
if(!CollectionUtils.isEmpty(list)) { if(!CollectionUtils.isEmpty(list)) {
return list.get(0); return list.get(0);

10
emis-biz/src/main/resources/mapper/EmisCountryMapper.xml
View File

@ -56,6 +56,14 @@
<if test="updateTime != null "> and update_time = #{updateTime}</if> <if test="updateTime != null "> and update_time = #{updateTime}</if>
<if test="createSite != null and createSite != ''"> and create_site like concat('%', #{createSite}, '%')</if> <if test="createSite != null and createSite != ''"> and create_site like concat('%', #{createSite}, '%')</if>
<if test="updateSite != null and updateSite != ''"> and update_site like concat('%', #{updateSite}, '%')</if> <if test="updateSite != null and updateSite != ''"> and update_site like concat('%', #{updateSite}, '%')</if>
<if test="params.name != null and params.name != ''">
and (
three_code = #{params.name}
or two_code = #{params.name}
or name = #{params.name}
or (name_en != '' and name_en = #{params.name})
)
</if>
</where> </where>
<if test="params.codeSortList != null and params.codeSortList.size >0 "> <if test="params.codeSortList != null and params.codeSortList.size >0 ">
@ -164,4 +172,4 @@
#{id} #{id}
</foreach> </foreach>
</delete> </delete>
</mapper> </mapper>