Skip to content

Y
yifu-mvp
Commit 013a7a7b authored by fangxinjiang's avatar fangxinjiang
Browse files
Options

Merge remote-tracking branch 'origin/develop' into develop

parents a72dfa64 baeb4c0d
Show whitespace changes
Inline Side-by-side
Showing with 12 additions and 2 deletions
yifu-social/yifu-social-biz/src/main/resources/mapper/SysBaseSetInfoMapper.xml
View file @ 013a7a7b
...@@ -153,11 +153,21 @@ ...@@ -153,11 +153,21 @@
AND a.PROVINCE = #{sysBaseSetInfo.province} AND a.PROVINCE = #{sysBaseSetInfo.province}
</if> </if>
<if test="sysBaseSetInfo.city != null"> <if test="sysBaseSetInfo.city != null">
<if test="sysBaseSetInfo.city != -1">
AND a.CITY = #{sysBaseSetInfo.city} AND a.CITY = #{sysBaseSetInfo.city}
</if> </if>
<if test="sysBaseSetInfo.city == -1">
AND a.CITY is null
</if>
</if>
<if test="sysBaseSetInfo.town != null"> <if test="sysBaseSetInfo.town != null">
<if test="sysBaseSetInfo.town != -1">
AND a.TOWN = #{sysBaseSetInfo.town} AND a.TOWN = #{sysBaseSetInfo.town}
</if> </if>
<if test="sysBaseSetInfo.town == -1">
AND a.TOWN is null
</if>
</if>
<if test="sysBaseSetInfo.applyStartDate != null"> <if test="sysBaseSetInfo.applyStartDate != null">
AND a.APPLY_START_DATE <![CDATA[ <= ]]> #{sysBaseSetInfo.applyStartDate} AND a.APPLY_START_DATE <![CDATA[ <= ]]> #{sysBaseSetInfo.applyStartDate}
AND (a.APPLY_END_DATE is null or a.APPLY_END_DATE <![CDATA[ >= ]]> #{sysBaseSetInfo.applyStartDate}) AND (a.APPLY_END_DATE is null or a.APPLY_END_DATE <![CDATA[ >= ]]> #{sysBaseSetInfo.applyStartDate})
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment