|
|
|
@@ -504,14 +504,13 @@ |
|
|
|
and o.tenant_id=#{tenantId} |
|
|
|
<if test=" null != id "> |
|
|
|
and cm.`merchant_id` = #{id} |
|
|
|
and mb.merchant_id = #{id} |
|
|
|
</if> |
|
|
|
|
|
|
|
<if test=" null != userName "> |
|
|
|
and mb.`name` like concat('%', #{userName},'%') |
|
|
|
and cb.`name` like concat('%', #{userName},'%') |
|
|
|
</if> |
|
|
|
<if test=" null != phone "> |
|
|
|
and mb.`phone` like concat('%', #{phone},'%') |
|
|
|
and cb.`phone` like concat('%', #{phone},'%') |
|
|
|
</if> |
|
|
|
<if test=" null != couponName "> |
|
|
|
and co.`title` like concat('%', #{couponName},'%') |
|
|
|
|