|
|
@@ -296,23 +296,17 @@
|
|
|
left join admin_location al on al.admin_id = a.id
|
|
|
left join admin aa on aa.id = a.superior_id
|
|
|
where 1 = 1
|
|
|
- <if test="provinceList != null">
|
|
|
+ <if test="provinceList != null and provinceList != ''">
|
|
|
and al.province in
|
|
|
<foreach collection="provinceList" item="plist" open="(" separator="," close=")">
|
|
|
#{plist}
|
|
|
</foreach>
|
|
|
</if>
|
|
|
- <if test = "provinceList != null && cityList != null">
|
|
|
- or
|
|
|
- </if>
|
|
|
- <if test="cityList != null">
|
|
|
- <if test="provinceList == null">
|
|
|
- and
|
|
|
- </if>
|
|
|
- al.city in
|
|
|
- <foreach collection="cityList" item="clist" open="(" separator="," close=")">
|
|
|
- #{clist}
|
|
|
- </foreach>
|
|
|
+ <if test="cityList != null and cityList !=''">
|
|
|
+ and al.city in
|
|
|
+ <foreach collection="cityList" item="clist" open="(" separator="," close=")">
|
|
|
+ #{clist}
|
|
|
+ </foreach>
|
|
|
</if>
|
|
|
</select>
|
|
|
|