From d48f46e56d92253c6e06385bbe67864e8919df3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=86=B7=E5=86=B7?= Date: Mon, 15 Apr 2019 23:40:04 +0800 Subject: [PATCH] =?UTF-8?q?:bug:=20Fixing=20a=20bug.=20=E7=B2=89=E4=B8=9D?= =?UTF-8?q?=E6=B6=88=E6=81=AF=E4=B8=8D=E8=83=BD=E9=80=9A=E8=BF=87=E8=87=AA?= =?UTF-8?q?=E5=8A=A8=E7=A7=9F=E6=88=B7=E7=BB=B4=E6=8A=A4=EF=BC=8C=E5=9B=A0?= =?UTF-8?q?=E4=B8=BA=E5=BE=AE=E4=BF=A1=E4=BC=A0=E9=80=92=E8=BF=87=E6=9D=A5?= =?UTF-8?q?=E6=97=B6=E6=B2=A1=E6=9C=89=E7=A7=9F=E6=88=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/6pigxx_mp.sql | 4 ++-- pigx-config/src/main/resources/config/pigx-mp-manager-dev.yml | 1 - .../com/pig4cloud/pigx/mp/controller/WxFansMsgController.java | 4 ++++ 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/db/6pigxx_mp.sql b/db/6pigxx_mp.sql index 2acd2f83b..4ee8b7552 100644 --- a/db/6pigxx_mp.sql +++ b/db/6pigxx_mp.sql @@ -114,8 +114,8 @@ CREATE TABLE `wx_fans_msg_res` ( -- ---------------------------- -- Table structure for `wx_menu` -- ---------------------------- -DROP TABLE IF EXISTS `wx_menu`; -CREATE TABLE `wx_menu` ( +DROP TABLE IF EXISTS `wx_mp_menu`; +CREATE TABLE `wx_mp_menu` ( `id` int(10) NOT NULL AUTO_INCREMENT COMMENT '主键', `menu` json DEFAULT NULL COMMENT '菜单', `wx_account_id` int(11) DEFAULT NULL, diff --git a/pigx-config/src/main/resources/config/pigx-mp-manager-dev.yml b/pigx-config/src/main/resources/config/pigx-mp-manager-dev.yml index e6f941641..17c6d3409 100644 --- a/pigx-config/src/main/resources/config/pigx-mp-manager-dev.yml +++ b/pigx-config/src/main/resources/config/pigx-mp-manager-dev.yml @@ -28,5 +28,4 @@ pigx: - wx_menu - wx_account - wx_account_fans - - wx_fans_msg - wx_fans_msg_res \ No newline at end of file diff --git a/pigx-visual/pigx-mp-manager/src/main/java/com/pig4cloud/pigx/mp/controller/WxFansMsgController.java b/pigx-visual/pigx-mp-manager/src/main/java/com/pig4cloud/pigx/mp/controller/WxFansMsgController.java index d1200085c..8c3c7903a 100755 --- a/pigx-visual/pigx-mp-manager/src/main/java/com/pig4cloud/pigx/mp/controller/WxFansMsgController.java +++ b/pigx-visual/pigx-mp-manager/src/main/java/com/pig4cloud/pigx/mp/controller/WxFansMsgController.java @@ -19,6 +19,7 @@ package com.pig4cloud.pigx.mp.controller; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.pig4cloud.pigx.common.core.util.R; +import com.pig4cloud.pigx.common.data.tenant.TenantContextHolder; import com.pig4cloud.pigx.common.log.annotation.SysLog; import com.pig4cloud.pigx.mp.entity.WxFansMsg; import com.pig4cloud.pigx.mp.service.WxFansMsgService; @@ -49,6 +50,7 @@ public class WxFansMsgController { */ @GetMapping("/page") public R getWxFansMsgPage(Page page, WxFansMsg wxFansMsg) { + wxFansMsg.setTenantId(TenantContextHolder.getTenantId()); return new R<>(wxFansMsgService.page(page, Wrappers.query(wxFansMsg))); } @@ -74,6 +76,7 @@ public class WxFansMsgController { @PostMapping @PreAuthorize("@pms.hasPermission('mp_wxfansmsg_add')") public R save(@RequestBody WxFansMsg wxFansMsg) { + wxFansMsg.setTenantId(TenantContextHolder.getTenantId()); return new R<>(wxFansMsgService.save(wxFansMsg)); } @@ -87,6 +90,7 @@ public class WxFansMsgController { @PutMapping @PreAuthorize("@pms.hasPermission('mp_wxfansmsg_edit')") public R updateById(@RequestBody WxFansMsg wxFansMsg) { + wxFansMsg.setTenantId(TenantContextHolder.getTenantId()); return new R<>(wxFansMsgService.updateById(wxFansMsg)); }