| @@ -482,7 +482,7 @@ | |||||
| and cm.`merchant_id` = #{merchantId} | and cm.`merchant_id` = #{merchantId} | ||||
| </if> | </if> | ||||
| <!--如果配置了审批模板,需要过滤投放审批状态--> | |||||
| <!--<!–如果配置了审批模板,需要过滤投放审批状态–> | |||||
| <if test="0 != filterCanPut or null ==filterCanPut "> | <if test="0 != filterCanPut or null ==filterCanPut "> | ||||
| <if test=" null != pressModelId and 0l != pressModelId"> | <if test=" null != pressModelId and 0l != pressModelId"> | ||||
| and if(c.type=8,c.put_apply_status =2 or c.id in ( | and if(c.type=8,c.put_apply_status =2 or c.id in ( | ||||
| @@ -521,7 +521,7 @@ | |||||
| ),1=1) | ),1=1) | ||||
| </if> | </if> | ||||
| <if test=" null != couponModelId and 0l != couponModelId"> | <if test=" null != couponModelId and 0l != couponModelId"> | ||||
| and if(c.type !=8 and c.type !=9 and c.type!=100,c.put_apply_status =2 or c.id in ( | |||||
| and if(c.type !=8 and c.type !=9 and c.type!=100, c.put_apply_status =2 or c.id in ( | |||||
| select coupon_id from wx_coupon_channel | select coupon_id from wx_coupon_channel | ||||
| where status=0 | where status=0 | ||||
| <if test=" null != tenantId and '' != tenantId"> | <if test=" null != tenantId and '' != tenantId"> | ||||
| @@ -532,7 +532,7 @@ | |||||
| </if> | </if> | ||||
| ),1=1) | ),1=1) | ||||
| </if> | </if> | ||||
| </if> | |||||
| </if>--> | |||||
| <if test=" null != ids "> | <if test=" null != ids "> | ||||
| and c.id in | and c.id in | ||||