|
|
|
@@ -130,7 +130,6 @@ |
|
|
|
FROM wx_merchant m |
|
|
|
left join wx_brand b on b.id = m.brand |
|
|
|
left join wx_business bu on b.id = m.business_id |
|
|
|
where ms.is_del = 0 |
|
|
|
<where> |
|
|
|
<if test=" null != tenantId "> |
|
|
|
and m.`tenant_id` = #{tenantId} |
|
|
|
@@ -178,7 +177,7 @@ |
|
|
|
FROM wx_merchant m |
|
|
|
left join wx_brand b on b.id = m.brand |
|
|
|
left join wx_business bu on b.id = m.business_id |
|
|
|
where ms.is_del = 0 |
|
|
|
where 1=1 |
|
|
|
<if test=" null != merchantName and ''!=merchantName "> |
|
|
|
and m.`name` like concat('%', #{merchantName},'%') |
|
|
|
</if> |
|
|
|
|