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

yifu-salary/yifu-salary-biz/src/main/resources/mapper/TMinSalaryMapper.xml

@@ -117,7 +117,7 @@
 						</if>
 					</if>
 				</if>
-				<if test="tMinSalary.town != null and tMinSalary.town.trim() != ''">
+				<if test="tMinSalary.town != null">
 					AND TOWN = '${tMinSalary.town}'
 				</if>
 			</if>
@@ -184,20 +184,20 @@
 						</if>
 					</if>
 				</if>
-				<if test="tMinSalary.town != null and tMinSalary.town.trim() != ''">
+				<if test="tMinSalary.town != null ">
 					AND (TOWN = '${tMinSalary.town}' = '${tMinSalary.town}')
 				</if>
 			</if>
 			<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 (
 					(PROVINCE = '${tMinSalary.province}' and (a.CITY is null or a.CITY =''))
 				</if>
-				<if test="tMinSalary.city != null and tMinSalary.city.trim() != '' and tMinSalary.town == null">
+				<if test="tMinSalary.city != null and tMinSalary.town == null">
 					AND (
 					(CITY = '${tMinSalary.city}'  and (TOWN is null  or TOWN =''))
 				</if>
-				<if test="tMinSalary.town != null and tMinSalary.town.trim() != ''">
+				<if test="tMinSalary.town != null ">
 					AND (TOWN = '${tMinSalary.town}' or TOWN = '${tMinSalary.town}')
 				</if>
 			</if>