From 58ca5373a817b7fda74f55ef490952acc82e00a5 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Thu, 13 Jun 2019 15:06:45 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=88=91=E7=9A=84=E6=B4=BB=E5=8A=A8][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E6=9F=A5=E8=AF=A2]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/iformall/tenant/TenantInfoImpl.java | 5 ++++- .../com/iformall/controller/WxActivityJoinController.java | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/tenant/TenantInfoImpl.java b/mallinkAdmin/src/main/java/com/iformall/tenant/TenantInfoImpl.java index dd21ea44b..6e4f84f47 100644 --- a/mallinkAdmin/src/main/java/com/iformall/tenant/TenantInfoImpl.java +++ b/mallinkAdmin/src/main/java/com/iformall/tenant/TenantInfoImpl.java @@ -92,7 +92,10 @@ public class TenantInfoImpl implements TenantInfo { return true; if ("com.iformall.mapper.WxLevelConfigMapper.batchUpdate".equals(ms.getId())) return true; - + if ("com.iformall.mapper.com.iformall.mapper.WxBillRentMapper.updateBills".equals(ms.getId())) + return true; + if ("com.iformall.mapper.com.iformall.mapper.WxBillPropertyMapper.updateBills".equals(ms.getId())) + return true; return false; } } diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxActivityJoinController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxActivityJoinController.java index 54c97ac34..c18baaf45 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxActivityJoinController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxActivityJoinController.java @@ -34,6 +34,7 @@ public class WxActivityJoinController extends BaseController { @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) public ResultData list(@ModelAttribute WxActivityJoin wxActivityJoin, Integer pageNum, Integer pageSize) { if (null == wxActivityJoin) wxActivityJoin = new WxActivityJoin(); + wxActivityJoin.setUserId(getUserId()); wxActivityJoin.setTenantId(getTenantId()); wxActivityJoin.setSortColumns(WxActivityJoin.Field.CreateTime_DESC); final PageInfo page = wxActivityJoinService.clistAsPage(wxActivityJoin, pageNum, pageSize);