Browse Source

[数据权限][修改][商户及商铺导出]

release_toaliyun_real
gongbiao 6 years ago
parent
commit
6bc98c5af0
2 changed files with 17 additions and 5 deletions
  1. +1
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxMerchantTradeDailyController.java
  2. +16
    -4
      mallinkService/src/main/resources/mapper/WxMerchantMapper.xml

+ 1
- 1
mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxMerchantTradeDailyController.java View File

@@ -102,7 +102,7 @@ public class WxMerchantTradeDailyController extends BaseController {
if (null == wxMerchantTradeDaily) {
wxMerchantTradeDaily = new WxMerchantTradeDaily();
}
wxMerchantTradeDaily.setTenantId(getTenantId());
wxMerchantTradeDaily.setSortColumns(BaseEntity.SortField.ReportDate_DESC,BaseEntity.SortField.MerchantId_DESC);
wxMerchantTradeDailyService.exportData(wxMerchantTradeDaily, request, response);
}


+ 16
- 4
mallinkService/src/main/resources/mapper/WxMerchantMapper.xml View File

@@ -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>


Loading…
Cancel
Save