|
|
|
@@ -131,9 +131,21 @@ |
|
|
|
#{idItem} |
|
|
|
</foreach> |
|
|
|
</if> |
|
|
|
|
|
|
|
<include refid="dataRule"/> |
|
|
|
|
|
|
|
|
|
|
|
<if test="(null != floorForRule and '' != floorForRule) or (null != businessForRule and '' != businessForRule)"> |
|
|
|
and id in( |
|
|
|
select ms.merchant_id from (select merchant_id,shop_id from wx_merchant_shop where is_del=0) ms |
|
|
|
inner join wx_merchant m on ms.merchant_id = m.id |
|
|
|
inner join wx_shop s on s.id=ms.shop_id |
|
|
|
where m.tenant_id=#{tenantId} and s.is_del=0 |
|
|
|
<if test=" null != businessForRule and '' != businessForRule "> |
|
|
|
and m.business_id in (${businessForRule}) |
|
|
|
</if> |
|
|
|
<if test=" null != floorForRule and '' != floorForRule "> |
|
|
|
and s.`floor` in (${floorForRule}) |
|
|
|
</if> |
|
|
|
) |
|
|
|
</if> |
|
|
|
|
|
|
|
<if test=" null != sortColumns">order by ${sortColumns}</if> |
|
|
|
</sql> |
|
|
|
@@ -141,7 +153,7 @@ |
|
|
|
<select id="findList" parameterType="com.iformall.domain.po.WxMerchant" resultMap="BaseResultMap"> |
|
|
|
select |
|
|
|
<include refid="allColumns"/> |
|
|
|
from wx_merchant |
|
|
|
from wx_merchant m |
|
|
|
<include refid="dynamicWhereConditions"/> |
|
|
|
</select> |
|
|
|
|
|
|
|
|