|
|
@@ -1251,13 +1251,15 @@ member_lvl = values(member_lvl)
|
|
|
</if>
|
|
|
</if>
|
|
|
<if test="reviewProvince !=null">
|
|
|
- and a.review_province = #{reviewProvince}
|
|
|
+ and (a.review_province = #{reviewProvince}
|
|
|
+ or a.review_country = #{reviewProvince})
|
|
|
</if>
|
|
|
<if test="finalSettlementStatus !=null">
|
|
|
and a.final_settlement_status = #{finalSettlementStatus}
|
|
|
</if>
|
|
|
<if test="adDeliverStatus !=null">
|
|
|
- and a.ad_deliver_status = #{adDeliverStatus}
|
|
|
+ and (a.ad_prepare_july_status = #{adDeliverStatus}
|
|
|
+ or a.ad_prepare_october_status = #{adDeliverStatus})
|
|
|
</if>
|
|
|
<if test="torchStatus !=null">
|
|
|
and a.torch_status = #{torchStatus}
|