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

yifu-social/yifu-social-biz/src/main/resources/mapper/SysBaseSetInfoMapper.xml

@@ -153,10 +153,20 @@
 				AND a.PROVINCE = #{sysBaseSetInfo.province}
 			</if>
 			<if test="sysBaseSetInfo.city != null">
-				AND a.CITY = #{sysBaseSetInfo.city}
+				<if test="sysBaseSetInfo.city != -1">
+					AND a.CITY = #{sysBaseSetInfo.city}
+				</if>
+				<if test="sysBaseSetInfo.city == -1">
+					AND a.CITY is null
+				</if>
 			</if>
 			<if test="sysBaseSetInfo.town != null">
-				AND a.TOWN = #{sysBaseSetInfo.town}
+				<if test="sysBaseSetInfo.town != -1">
+					AND a.TOWN = #{sysBaseSetInfo.town}
+				</if>
+				<if test="sysBaseSetInfo.town == -1">
+					AND a.TOWN is null
+				</if>
 			</if>
 			<if test="sysBaseSetInfo.applyStartDate != null">
 				AND a.APPLY_START_DATE <![CDATA[ <= ]]> #{sysBaseSetInfo.applyStartDate}