Commit c3ec3877 authored by huyuchen's avatar huyuchen

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

parents 75ee063d a0e2df73
...@@ -395,7 +395,7 @@ ...@@ -395,7 +395,7 @@
</if> </if>
<!-- 区域 默认精准查询 0 包含下级查询 1 开始 2023-03-02 fxj --> <!-- 区域 默认精准查询 0 包含下级查询 1 开始 2023-03-02 fxj -->
<if test="tPaymentInfo.areaFlag == null || tPaymentInfo.areaFlag == '0'"> <if test='tPaymentInfo.areaFlag == null || tPaymentInfo.areaFlag == "1"'>
<if test="tPaymentInfo.socialTown == null"> <if test="tPaymentInfo.socialTown == null">
<if test="tPaymentInfo.socialCity != null"> <if test="tPaymentInfo.socialCity != null">
AND (a.SOCIAL_CITY = '${tPaymentInfo.socialCity}' or a.FUND_CITY = '${tPaymentInfo.socialCity}') AND (a.SOCIAL_CITY = '${tPaymentInfo.socialCity}' or a.FUND_CITY = '${tPaymentInfo.socialCity}')
...@@ -410,7 +410,7 @@ ...@@ -410,7 +410,7 @@
AND (a.SOCIAL_TOWN = '${tPaymentInfo.socialTown}' or a.FUND_TOWN = '${tPaymentInfo.socialTown}') AND (a.SOCIAL_TOWN = '${tPaymentInfo.socialTown}' or a.FUND_TOWN = '${tPaymentInfo.socialTown}')
</if> </if>
</if> </if>
<if test="tPaymentInfo.areaFlag == '1'"> <if test='tPaymentInfo.areaFlag == "0"'>
<if test="tPaymentInfo.socialProvince != null and tPaymentInfo.socialProvince.trim() != '' and tPaymentInfo.socialCity == null"> <if test="tPaymentInfo.socialProvince != null and tPaymentInfo.socialProvince.trim() != '' and tPaymentInfo.socialCity == null">
AND ( AND (
(a.SOCIAL_PROVINCE = '${tPaymentInfo.socialProvince}' and a.SOCIAL_CITY is null) (a.SOCIAL_PROVINCE = '${tPaymentInfo.socialProvince}' and a.SOCIAL_CITY is null)
...@@ -631,7 +631,7 @@ ...@@ -631,7 +631,7 @@
AND a.FUND_CITY = #{tPaymentInfo.fundCity} AND a.FUND_CITY = #{tPaymentInfo.fundCity}
</if> </if>
<!-- 区域 默认精准查询 0 包含下级查询 1 开始 2023-03-02 fxj --> <!-- 区域 默认精准查询 0 包含下级查询 1 开始 2023-03-02 fxj -->
<if test="tPaymentInfo.areaFlag == null || tPaymentInfo.areaFlag == '0'"> <if test='tPaymentInfo.areaFlag == null || tPaymentInfo.areaFlag == "1"'>
<if test="tPaymentInfo.socialTown == null"> <if test="tPaymentInfo.socialTown == null">
<if test="tPaymentInfo.socialCity != null"> <if test="tPaymentInfo.socialCity != null">
AND (a.SOCIAL_CITY = '${tPaymentInfo.socialCity}' or a.FUND_CITY = '${tPaymentInfo.socialCity}') AND (a.SOCIAL_CITY = '${tPaymentInfo.socialCity}' or a.FUND_CITY = '${tPaymentInfo.socialCity}')
...@@ -646,7 +646,7 @@ ...@@ -646,7 +646,7 @@
AND (a.SOCIAL_TOWN = '${tPaymentInfo.socialTown}' or a.FUND_TOWN = '${tPaymentInfo.socialTown}') AND (a.SOCIAL_TOWN = '${tPaymentInfo.socialTown}' or a.FUND_TOWN = '${tPaymentInfo.socialTown}')
</if> </if>
</if> </if>
<if test="tPaymentInfo.areaFlag == '1'"> <if test='tPaymentInfo.areaFlag == "0"'>
<if test="tPaymentInfo.socialProvince != null and tPaymentInfo.socialProvince.trim() != '' and tPaymentInfo.socialCity == null"> <if test="tPaymentInfo.socialProvince != null and tPaymentInfo.socialProvince.trim() != '' and tPaymentInfo.socialCity == null">
AND ( AND (
(a.SOCIAL_PROVINCE = '${tPaymentInfo.socialProvince}' and a.SOCIAL_CITY is null) (a.SOCIAL_PROVINCE = '${tPaymentInfo.socialProvince}' and a.SOCIAL_CITY is null)
......
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