From 7762a0d4166003027757cda75e825fd38617b726 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Tue, 18 Sep 2018 15:53:15 +0800 Subject: [PATCH] =?UTF-8?q?[=E7=9F=AD=E4=BF=A1][=E9=AA=8C=E8=AF=81?= =?UTF-8?q?=E7=A0=81][=E4=BF=AE=E6=94=B9=E5=8F=91=E9=80=81=E7=9A=84?= =?UTF-8?q?=E9=80=BB=E8=BE=91]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WxMsgValidationcodeModelController.java | 3 ++- .../iformall/service/impl/WxMsgValidationcodeServiceImpl.java | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxMsgValidationcodeModelController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxMsgValidationcodeModelController.java index 6d1136ec2..08a3ccea8 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxMsgValidationcodeModelController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxMsgValidationcodeModelController.java @@ -26,6 +26,7 @@ public class WxMsgValidationcodeModelController extends BaseController { @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) public ResultData list(@ModelAttribute WxMsgValidationcodeModel wxMsgValidationcodeModel, Integer pageNum, Integer pageSize) { if (null == wxMsgValidationcodeModel) wxMsgValidationcodeModel = new WxMsgValidationcodeModel(); + wxMsgValidationcodeModel.setTenantId(getTenantId()); final PageInfo page = wxMsgValidationcodeModelService.listAsPage(wxMsgValidationcodeModel, pageNum, pageSize); return new ResultData(page); } @@ -34,7 +35,7 @@ public class WxMsgValidationcodeModelController extends BaseController { public ResultData add(@RequestBody WxMsgValidationcodeModel wxMsgValidationcodeModel) { //Assert.notNull(wxMsgValidationcodeModel.getName(), "角色名不能为空"); //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); - + wxMsgValidationcodeModel.setTenantId(getTenantId()); return wxMsgValidationcodeModelService.saveOrUpdate(wxMsgValidationcodeModel); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgValidationcodeServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgValidationcodeServiceImpl.java index 2476b7bbe..4fe377553 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgValidationcodeServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgValidationcodeServiceImpl.java @@ -95,14 +95,14 @@ public class WxMsgValidationcodeServiceImpl implements WxMsgValidationcodeServic //3、从短信配置中查询密钥 bid 等信息 WxMsgConfig wxMsgConfig = new WxMsgConfig(); - wxMsgConfig.setAppid(wxMsgValidationcode.getAppid()); + wxMsgConfig.setTenantId(wxMsgValidationcode.getTenantId()); List wxMsgConfigs = wxMsgConfigMapper.findList(wxMsgConfig); if (wxMsgConfigs.size() == 0) new ResultData(ErrorCode.MSG_SEND_ERROR.getCode(),"发送失败"); wxMsgConfig = wxMsgConfigs.get(0); WxMsgValidationcodeModel wxMsgValidationcodeModel = new WxMsgValidationcodeModel(); wxMsgValidationcodeModel.setTenantId(wxMsgConfig.getTenantId()); - wxMsgValidationcodeModel.setType(1); + wxMsgValidationcodeModel.setType(wxMsgValidationcode.getType()); wxMsgValidationcodeModel = wxMsgValidationcodeModelMapper.findList(wxMsgValidationcodeModel).get(0); wxMsgValidationcode.setSignature(wxMsgValidationcodeModel.getSignature());