|
|
|
@@ -129,7 +129,7 @@ |
|
|
|
<include refid="allMerchantVoColumns"/> |
|
|
|
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 |
|
|
|
left join wx_business bu on bu.id = m.business_id |
|
|
|
<where> |
|
|
|
<if test=" null != tenantId "> |
|
|
|
and m.`tenant_id` = #{tenantId} |
|
|
|
@@ -176,7 +176,7 @@ |
|
|
|
<include refid="allMerchantVoColumns"/> |
|
|
|
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 |
|
|
|
left join wx_business bu on bu.id = m.business_id |
|
|
|
where 1=1 |
|
|
|
<if test=" null != merchantName and ''!=merchantName "> |
|
|
|
and m.`name` like concat('%', #{merchantName},'%') |
|
|
|
|