md
This commit is contained in:
parent
ca91f16655
commit
74059d8bae
@ -18,7 +18,6 @@
|
||||
<result property="zipCode" column="zip_code" />
|
||||
<result property="orderNum" column="order_num" />
|
||||
|
||||
|
||||
<!-- <result property="countryName" column="country_name" />-->
|
||||
<association property="countryName" column="country_code" select="com.xdadan.erp.oms.mapper.EmisBaseMapper.selectCountryNameByCode"/>
|
||||
|
||||
@ -44,13 +43,22 @@
|
||||
</if>
|
||||
<if test="regionNameEn != null and regionNameEn != ''">
|
||||
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, '%') )
|
||||
)
|
||||
|
||||
</if>
|
||||
|
||||
<if test="searchValue != null and searchValue != ''">
|
||||
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, '%') )
|
||||
)
|
||||
</if>
|
||||
<if test="regionType != null "> and region_type = #{regionType}</if>
|
||||
<if test="shortName != null and shortName != ''"> and short_name like concat('%', #{shortName}, '%')</if>
|
||||
<if test="parentCode != null and parentCode != ''"> and parent_code=#{parentCode}</if>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user