From 4de3afb5bf0aa08e9ca0b7fd5d6ab23c98d63fea Mon Sep 17 00:00:00 2001 From: gongbiao Date: Tue, 2 Apr 2019 11:51:21 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=8B=BC=E5=9B=A2=E8=90=A5=E9=94=80=E5=88=86?= =?UTF-8?q?=E6=9E=90][=E4=BF=AE=E6=94=B9][tenantId=E9=97=AE=E9=A2=98]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/iformall/controller/WxOrderGroupController.java | 1 + .../src/main/resources/mapper/WxOrderGroupMapper.xml | 3 +++ 2 files changed, 4 insertions(+) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxOrderGroupController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxOrderGroupController.java index 272810685..096ee2ac3 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxOrderGroupController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxOrderGroupController.java @@ -35,6 +35,7 @@ public class WxOrderGroupController extends BaseController { }) @SystemControllerLog(description = "订单管理-拼团营销分析") public ResultData queryOrderGroupMarketingList(@ModelAttribute WxOrderGroupMarketing wxOrderGroupMarketing, Integer pageNum, Integer pageSize) { + wxOrderGroupMarketing.setTenantId(getTenantId()); final PageInfo page = wxOrderGroupService.queryOrderGroupMarketingList(wxOrderGroupMarketing, pageNum, pageSize); return new ResultData(page); } diff --git a/mallinkService/src/main/resources/mapper/WxOrderGroupMapper.xml b/mallinkService/src/main/resources/mapper/WxOrderGroupMapper.xml index 0f23416e6..e0ba294bc 100644 --- a/mallinkService/src/main/resources/mapper/WxOrderGroupMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxOrderGroupMapper.xml @@ -112,6 +112,9 @@ from wx_coupon c where type=9 order by c.status,c.id desc ) c + + and c.tenant_id=#{tenantId} + and c.coupon_id=#{couponId}