| @@ -126,6 +126,22 @@ | |||||
| <if test=" null != latePayStatus ">and br.`late_pay_status` = #{latePayStatus}</if> | <if test=" null != latePayStatus ">and br.`late_pay_status` = #{latePayStatus}</if> | ||||
| <if test=" null != latePayStatus ">and br.`late_pay_status` = #{latePayStatus}</if> | <if test=" null != latePayStatus ">and br.`late_pay_status` = #{latePayStatus}</if> | ||||
| <if test=" null != depositStatus ">and d.`status` = #{depositStatus}</if> | <if test=" null != depositStatus ">and d.`status` = #{depositStatus}</if> | ||||
| <if test=" null != building or null != floor"> | |||||
| and br.merchant_id in( | |||||
| select ms.merchant_id from (select merchant_id,shop_id from wx_merchant_shop where is_del=0) ms | |||||
| inner join wx_merchant m on ms.merchant_id = m.id | |||||
| inner join wx_shop s on s.id=ms.shop_id | |||||
| where s.is_del=0 | |||||
| <if test=" null != building "> | |||||
| and s.`building`= #{building} | |||||
| </if> | |||||
| <if test=" null != floor"> | |||||
| and s.`floor` = #{floor} | |||||
| </if> | |||||
| ) | |||||
| </if> | |||||
| </where> | </where> | ||||
| <if test=" null != sortColumns">order by ${sortColumns}</if> | <if test=" null != sortColumns">order by ${sortColumns}</if> | ||||
| </select> | </select> | ||||