|
|
@@ -455,10 +455,10 @@ |
|
|
<if test=" null != status"> |
|
|
<if test=" null != status"> |
|
|
and s.`status` = #{status} |
|
|
and s.`status` = #{status} |
|
|
</if> |
|
|
</if> |
|
|
<if test="null!=status and status==1"> |
|
|
|
|
|
|
|
|
<if test="null!=status and status==1 and type!=null and type==2"> |
|
|
and s.id not in( |
|
|
and s.id not in( |
|
|
SELECT shop_id FROM wx_rent_contract WHERE tenant_id = #{tenantId} and status not in(0,5,6,7) and |
|
|
|
|
|
merchant_id is not null |
|
|
|
|
|
|
|
|
SELECT shop_id FROM wx_rent_contract WHERE tenant_id = #{tenantId} and status not in(0,5,6,7) |
|
|
|
|
|
merchant_id is not null and rent_shop_type=2 |
|
|
) |
|
|
) |
|
|
</if> |
|
|
</if> |
|
|
<if test=" null != type "> |
|
|
<if test=" null != type "> |
|
|
|