|
|
|
@@ -261,7 +261,7 @@ |
|
|
|
<if test=" null != rentShopType "> |
|
|
|
and m.id not in( |
|
|
|
select merchant_id from wx_rent_contract where tenant_id=#{tenantId} and rent_shop_type=1 and merchant_id is |
|
|
|
not null and status in(1,2,3,4) |
|
|
|
not null and status in(1,2,3,4,8) |
|
|
|
) |
|
|
|
</if> |
|
|
|
<if test=" null != ids "> |
|
|
|
@@ -490,10 +490,10 @@ |
|
|
|
</if> |
|
|
|
|
|
|
|
<if test=" null != userName "> |
|
|
|
and c.`nick_name` like concat('%', #{userName},'%') |
|
|
|
and mb.`name` like concat('%', #{userName},'%') |
|
|
|
</if> |
|
|
|
<if test=" null != phone "> |
|
|
|
and c.`phone` like concat('%', #{phone},'%') |
|
|
|
and mb.`phone` like concat('%', #{phone},'%') |
|
|
|
</if> |
|
|
|
<if test=" null != couponName "> |
|
|
|
and co.`title` like concat('%', #{couponName},'%') |
|
|
|
|