diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxMsgCallbackController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxMsgCallbackController.java index d78cd200a..70bdb852b 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxMsgCallbackController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxMsgCallbackController.java @@ -30,6 +30,7 @@ public class WxMsgCallbackController extends BaseController @ApiImplicitParam(name="pageSize",value="每页条数",dataType="int", paramType = "query",required=true)}) public ResultData list(@ModelAttribute WxMsgCallback wxMsgCallback,Integer pageNum, Integer pageSize) { if (null == wxMsgCallback) wxMsgCallback = new WxMsgCallback(); + wxMsgCallback.setTenantId(getTenantId()); final PageInfo page = wxMsgCallbackService.listAsPage(wxMsgCallback, pageNum, pageSize); return new ResultData(page); } @@ -39,6 +40,7 @@ public class WxMsgCallbackController extends BaseController public ResultData add(@RequestBody WxMsgCallback wxMsgCallback) { //Assert.notNull(wxMsgCallback.getName(), "角色名不能为空"); //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); + wxMsgCallback.setTenantId(getTenantId()); wxMsgCallbackService.saveOrUpdate(wxMsgCallback); return new ResultData(); } diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxMsgController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxMsgController.java index 9e2946256..813029468 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxMsgController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxMsgController.java @@ -35,6 +35,7 @@ public class WxMsgController extends BaseController @ApiImplicitParam(name="pageSize",value="每页条数",dataType="int", paramType = "query",required=true)}) public ResultData list(@ModelAttribute WxMsg wxMsg,Integer pageNum, Integer pageSize) { if (null == wxMsg) wxMsg = new WxMsg(); + wxMsg.setTenantId(getTenantId()); final PageInfo page = wxMsgService.listAsPage(wxMsg, pageNum, pageSize); return new ResultData(page); } diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxMsgSignatureController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxMsgSignatureController.java index 560add66f..0ffa82220 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxMsgSignatureController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxMsgSignatureController.java @@ -28,6 +28,7 @@ public class WxMsgSignatureController extends BaseController @ApiImplicitParam(name="pageSize",value="每页条数",dataType="int", paramType = "query",required=true)}) public ResultData list(@ModelAttribute WxMsgSignature wxMsgSignature,Integer pageNum, Integer pageSize) { if (null == wxMsgSignature) wxMsgSignature = new WxMsgSignature(); + wxMsgSignature.setTenantId(getTenantId()); final PageInfo page = wxMsgSignatureService.listAsPage(wxMsgSignature, pageNum, pageSize); return new ResultData(page); } @@ -37,6 +38,7 @@ public class WxMsgSignatureController extends BaseController public ResultData add(@RequestBody WxMsgSignature wxMsgSignature) { //Assert.notNull(wxMsgSignature.getName(), "角色名不能为空"); //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); + wxMsgSignature.setTenantId(getTenantId()); wxMsgSignatureService.saveOrUpdate(wxMsgSignature); return new ResultData(); } @@ -66,7 +68,7 @@ public class WxMsgSignatureController extends BaseController @ApiOperation("获取所有数据") @GetMapping("getsignaturelist") public ResultData getmodellist() { - return wxMsgSignatureService.getsignaturelist(); + return wxMsgSignatureService.getsignaturelist(getTenantId()); } diff --git a/mallinkService/src/main/java/com/simple/service/WxMsgSignatureService.java b/mallinkService/src/main/java/com/simple/service/WxMsgSignatureService.java index e9e2bb550..d2cc9414f 100644 --- a/mallinkService/src/main/java/com/simple/service/WxMsgSignatureService.java +++ b/mallinkService/src/main/java/com/simple/service/WxMsgSignatureService.java @@ -1,6 +1,5 @@ package com.simple.service; -import java.util.*; import com.github.pagehelper.PageInfo; import com.simple.common.ResultData; import com.simple.domain.po.WxMsgSignature; @@ -40,6 +39,6 @@ public interface WxMsgSignatureService { void deleteById(Long id); - ResultData getsignaturelist(); + ResultData getsignaturelist(String tenantId); } diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxMsgSignatureServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxMsgSignatureServiceImpl.java index 2c178406e..56de99904 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxMsgSignatureServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxMsgSignatureServiceImpl.java @@ -4,7 +4,6 @@ import java.util.*; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.simple.common.ResultData; -import com.simple.domain.po.WxMsgModel; import com.simple.domain.po.WxMsgSignature; import com.simple.mapper.WxMsgSignatureMapper; import com.simple.service.WxMsgSignatureService; @@ -35,7 +34,6 @@ public class WxMsgSignatureServiceImpl implements WxMsgSignatureService { //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); final IdWorker idWorker = IdWorker.get(); record.setId(idWorker.nextId()); - record.setTenantId("1"); record.setCreatetime(new Date()); wxMsgSignatureMapper.insertSelective(record); } else { @@ -49,9 +47,9 @@ public class WxMsgSignatureServiceImpl implements WxMsgSignatureService { } @Override - public ResultData getsignaturelist() { + public ResultData getsignaturelist(String tenantId) { WxMsgSignature wxMsgSignature = new WxMsgSignature(); - wxMsgSignature.setTenantId("1"); + wxMsgSignature.setTenantId(tenantId); List list = wxMsgSignatureMapper.findList(wxMsgSignature); return new ResultData(list); } diff --git a/mallinkService/src/main/resources/mapper/WxMsgCallbackMapper.xml b/mallinkService/src/main/resources/mapper/WxMsgCallbackMapper.xml index d8f4ddc76..4c77012b0 100644 --- a/mallinkService/src/main/resources/mapper/WxMsgCallbackMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMsgCallbackMapper.xml @@ -27,7 +27,7 @@ - and `tenant_id` like concat('%', #{tenantId},'%') + and `tenant_id` = #{tenantId} diff --git a/mallinkService/src/main/resources/mapper/WxMsgConfigMapper.xml b/mallinkService/src/main/resources/mapper/WxMsgConfigMapper.xml index c78da4524..86849e08b 100644 --- a/mallinkService/src/main/resources/mapper/WxMsgConfigMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMsgConfigMapper.xml @@ -35,7 +35,7 @@ - and `tenant_id` like concat('%', #{tenantId},'%') + and `tenant_id` = #{tenantId} diff --git a/mallinkService/src/main/resources/mapper/WxMsgMapper.xml b/mallinkService/src/main/resources/mapper/WxMsgMapper.xml index ef74336f5..7cc2ec810 100644 --- a/mallinkService/src/main/resources/mapper/WxMsgMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMsgMapper.xml @@ -36,7 +36,7 @@ - and `tenant_id` like concat('%', #{tenantId},'%') + and `tenant_id` = #{tenantId} diff --git a/mallinkService/src/main/resources/mapper/WxMsgSignatureMapper.xml b/mallinkService/src/main/resources/mapper/WxMsgSignatureMapper.xml index 8d7ecc478..4c5049775 100644 --- a/mallinkService/src/main/resources/mapper/WxMsgSignatureMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMsgSignatureMapper.xml @@ -21,7 +21,7 @@ - and `tenant_id` like concat('%', #{tenantId},'%') + and `tenant_id` = #{tenantId}