|
|
|
@@ -668,6 +668,7 @@ |
|
|
|
from wx_merchant m left join wx_merchant_shop wms on wms.merchant_id = m.id left join wx_shop ws on wms.shop_id = ws.id |
|
|
|
where 1=1 |
|
|
|
<if test=" null != tenantId"> and m.tenant_id = #{tenantId} </if> |
|
|
|
<if test=" null != merchantName"> and m.name like concat('%', #{merchantName},'%') </if> |
|
|
|
|
|
|
|
<if test=" null != sortColumns"> order by ${sortColumns} </if> |
|
|
|
<if test=" null == sortColumns"> order by m.id desc </if> |
|
|
|
|