|
|
@@ -176,7 +176,7 @@ |
|
|
</if> |
|
|
</if> |
|
|
<if test="null!=status and status==1"> |
|
|
<if test="null!=status and status==1"> |
|
|
and s.id not in( |
|
|
and s.id not in( |
|
|
SELECT shop_id FROM wx_rent_contract WHERE tenant_id = #{tenantId} and status!=1 and status!=6 and merchant_id is not null |
|
|
|
|
|
|
|
|
SELECT shop_id FROM wx_rent_contract WHERE tenant_id = #{tenantId} and status!=1 and status!=6 ans status!=7 and merchant_id is not null |
|
|
) |
|
|
) |
|
|
</if> |
|
|
</if> |
|
|
|
|
|
|
|
|
|