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

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

@@ -740,34 +740,44 @@
 				<if test="tPaymentInfo.providentPayAddr != null and tPaymentInfo.providentPayAddr.trim() != ''">
 					AND a.PROVIDENT_PAY_ADDR = #{tPaymentInfo.providentPayAddr}
 				</if>
-				<if test="tPaymentInfo.fundProvince != null and tPaymentInfo.fundProvince.trim() != ''">
-					AND a.FUND_PROVINCE = #{tPaymentInfo.fundProvince}
-				</if>
-				<if test="tPaymentInfo.fundCity != null and tPaymentInfo.fundCity.trim() != ''">
-					AND a.FUND_CITY = #{tPaymentInfo.fundCity}
-				</if>
-				<if test="tPaymentInfo.fundTown != null and tPaymentInfo.fundTown.trim() != ''">
-					AND a.FUND_TOWN = #{tPaymentInfo.fundTown}
-				</if>
-				<if test="tPaymentInfo.socialProvince != null and tPaymentInfo.socialProvince.trim() != ''">
-					AND (a.SOCIAL_PROVINCE = '${tPaymentInfo.socialProvince}' or a.FUND_PROVINCE = '${tPaymentInfo.socialProvince}')
-				</if>
-				<if test="tPaymentInfo.socialCity != null and tPaymentInfo.socialCity.trim() != ''">
-					AND (a.SOCIAL_CITY = '${tPaymentInfo.socialCity}' or a.FUND_CITY = '${tPaymentInfo.socialCity}')
-				</if>
-				<if test="tPaymentInfo.socialTown == null">
-					<if test="tPaymentInfo.socialCity != null">
-						AND (a.SOCIAL_CITY = '${tPaymentInfo.socialCity}' or a.FUND_CITY = '${tPaymentInfo.socialCity}')
-					</if>
-					<if test="tPaymentInfo.socialCity == null">
-						<if test="tPaymentInfo.socialProvince != null">
-							AND (a.SOCIAL_PROVINCE = '${tPaymentInfo.socialProvince}' or a.FUND_PROVINCE = '${tPaymentInfo.socialProvince}')
+
+				<!-- 区域 默认精准查询 0    包含下级查询 1 开始 2023-03-02 fxj -->
+				<if test='tPaymentInfo.areaFlag == null || tPaymentInfo.areaFlag == "1"'>
+					<if test="tPaymentInfo.socialTown == null">
+						<if test="tPaymentInfo.socialCity != null">
+							AND (a.SOCIAL_CITY = '${tPaymentInfo.socialCity}' or a.FUND_CITY = '${tPaymentInfo.socialCity}')
 						</if>
+						<if test="tPaymentInfo.socialCity == null">
+							<if test="tPaymentInfo.socialProvince != null">
+								AND (a.SOCIAL_PROVINCE = '${tPaymentInfo.socialProvince}' or a.FUND_PROVINCE = '${tPaymentInfo.socialProvince}')
+							</if>
+						</if>
+					</if>
+					<if test="tPaymentInfo.socialTown != null and tPaymentInfo.socialTown.trim() != ''">
+						AND (a.SOCIAL_TOWN = '${tPaymentInfo.socialTown}' or a.FUND_TOWN = '${tPaymentInfo.socialTown}')
 					</if>
 				</if>
-				<if test="tPaymentInfo.socialTown != null and tPaymentInfo.socialTown.trim() != ''">
-					AND (a.SOCIAL_TOWN = '${tPaymentInfo.socialTown}' or a.FUND_TOWN = '${tPaymentInfo.socialTown}')
+				<if test='tPaymentInfo.areaFlag == "0"'>
+					<if test="tPaymentInfo.socialProvince != null and tPaymentInfo.socialProvince.trim() != '' and tPaymentInfo.socialCity == null">
+						AND (
+						(a.SOCIAL_PROVINCE = '${tPaymentInfo.socialProvince}' and (a.SOCIAL_CITY is null or a.SOCIAL_CITY =''))
+						or
+						(a.FUND_PROVINCE = '${tPaymentInfo.socialProvince}' and (a.FUND_CITY is null or a.FUND_CITY =''))
+						)
+					</if>
+					<if test="tPaymentInfo.socialCity != null and tPaymentInfo.socialCity.trim() != '' and tPaymentInfo.socialTown == null">
+						AND (
+						(a.SOCIAL_CITY = '${tPaymentInfo.socialCity}'  and (a.SOCIAL_TOWN is null  or a.SOCIAL_TOWN =''))
+						or
+						(a.FUND_CITY = '${tPaymentInfo.socialCity}' and  (a.FUND_TOWN is null or a.FUND_TOWN =''))
+						)
+					</if>
+					<if test="tPaymentInfo.socialTown != null and tPaymentInfo.socialTown.trim() != ''">
+						AND (a.SOCIAL_TOWN = '${tPaymentInfo.socialTown}' or a.FUND_TOWN = '${tPaymentInfo.socialTown}')
+					</if>
 				</if>
+				<!-- 区域 默认精准查询 0    包含下级查询 1 结束  2023-03-02 fxj -->
+
 				<if test="tPaymentInfo.providentNo != null and tPaymentInfo.providentNo.trim() != ''">
 					AND a.PROVIDENT_NO = #{tPaymentInfo.providentNo}
 				</if>