|
|
|
@@ -811,12 +811,11 @@ |
|
|
|
left join wx_rent_contract rc on(rc.merchant_id = m.id) |
|
|
|
where m.status=1 |
|
|
|
) tt where 1=1 |
|
|
|
|
|
|
|
<if test=" null != tenantId"> and tt.tenant_id = #{tenantId} </if> |
|
|
|
<if test=" null != merchantId"> and tt.id = #{merchantId} </if> |
|
|
|
<if test=" null != merchantName and ''!=merchantName">and tt.name like concat('%', #{merchantName},'%')</if> |
|
|
|
<if test=" null != rentShopType"> and tt.rent_shop_type = #{rentShopType} </if> |
|
|
|
|
|
|
|
and (receivePay >0 or payOut>0) |
|
|
|
<if test=" null != sortColumns"> order by ${sortColumns} </if> |
|
|
|
<if test=" null == sortColumns"> order by tt.id desc </if> |
|
|
|
</select> |
|
|
|
|