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)); }