|
|
@@ -738,6 +738,8 @@ |
|
|
<if test=" null != tenantId"> and m.tenant_id = #{tenantId} </if> |
|
|
<if test=" null != tenantId"> and m.tenant_id = #{tenantId} </if> |
|
|
<if test=" null != merchantId"> and m.id = #{merchantId} </if> |
|
|
<if test=" null != merchantId"> and m.id = #{merchantId} </if> |
|
|
<if test=" null != merchantName"> and m.name like concat('%', #{merchantName},'%') </if> |
|
|
<if test=" null != merchantName"> and m.name like concat('%', #{merchantName},'%') </if> |
|
|
|
|
|
<if test=" null != rentShopType"> and rc.rent_shop_type = #{rentShopType} </if> |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<if test=" null != sortColumns"> order by ${sortColumns} </if> |
|
|
<if test=" null != sortColumns"> order by ${sortColumns} </if> |
|
|
<if test=" null == sortColumns"> order by m.id desc </if> |
|
|
<if test=" null == sortColumns"> order by m.id desc </if> |
|
|
|