Skip to content

Y
yifu-mvp
Commit be408c47 authored by wangzb's avatar wangzb
Browse files
Options

Merge remote-tracking branch 'origin/MVP1.5.4' into MVP1.5.4

parents d32757eb 20eed40c
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 5 deletions
yifu-salary/yifu-salary-biz/src/main/resources/mapper/TMinSalaryMapper.xml
View file @ be408c47
...@@ -117,7 +117,7 @@ ...@@ -117,7 +117,7 @@
</if> </if>
</if> </if>
</if> </if>
<if test="tMinSalary.town != null and tMinSalary.town.trim() != ''"> <if test="tMinSalary.town != null">
AND TOWN = '${tMinSalary.town}' AND TOWN = '${tMinSalary.town}'
</if> </if>
</if> </if>
...@@ -184,20 +184,20 @@ ...@@ -184,20 +184,20 @@
</if> </if>
</if> </if>
</if> </if>
<if test="tMinSalary.town != null and tMinSalary.town.trim() != ''"> <if test="tMinSalary.town != null ">
AND (TOWN = '${tMinSalary.town}' = '${tMinSalary.town}') AND (TOWN = '${tMinSalary.town}' = '${tMinSalary.town}')
</if> </if>
</if> </if>
<if test='tMinSalary.areaFlag == "0"'> <if test='tMinSalary.areaFlag == "0"'>
<if test="tMinSalary.province != null and tMinSalary.province.trim() != '' and tMinSalary.city == null"> <if test="tMinSalary.province != null and tMinSalary.city == null">
AND ( AND (
(PROVINCE = '${tMinSalary.province}' and (a.CITY is null or a.CITY ='')) (PROVINCE = '${tMinSalary.province}' and (a.CITY is null or a.CITY =''))
</if> </if>
<if test="tMinSalary.city != null and tMinSalary.city.trim() != '' and tMinSalary.town == null"> <if test="tMinSalary.city != null and tMinSalary.town == null">
AND ( AND (
(CITY = '${tMinSalary.city}' and (TOWN is null or TOWN ='')) (CITY = '${tMinSalary.city}' and (TOWN is null or TOWN =''))
</if> </if>
<if test="tMinSalary.town != null and tMinSalary.town.trim() != ''"> <if test="tMinSalary.town != null ">
AND (TOWN = '${tMinSalary.town}' or TOWN = '${tMinSalary.town}') AND (TOWN = '${tMinSalary.town}' or TOWN = '${tMinSalary.town}')
</if> </if>
</if> </if>
......
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