|
|
|
@@ -185,6 +185,8 @@ |
|
|
|
<if test="null != rentShopType and 2 == rentShopType and null != floorForRule and '' != floorForRule "> |
|
|
|
and rc.shop_id in (select id from wx_shop where tenant_id=#{tenantId} and floor in (${floorForRule})) |
|
|
|
</if> |
|
|
|
<if test=" null != merchantId">and rc.`merchant_id` = #{merchantId}</if> |
|
|
|
|
|
|
|
</where> |
|
|
|
<if test=" null != sortColumns"> order by ${sortColumns} </if> |
|
|
|
<if test=" null == sortColumns"> order by rc.createtime desc,rc.id desc </if> |
|
|
|
|