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/domain/po/MallUserInfo.java b/mallinkService/src/main/java/com/iformall/domain/po/MallUserInfo.java index 908b97635..5322a5b57 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/MallUserInfo.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/MallUserInfo.java @@ -41,28 +41,28 @@ public class MallUserInfo implements Serializable { - /*租户ID**/ + /**租户ID**/ @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") private String tenantId; - /*登录用户名**/ + /**登录用户名**/ @io.swagger.annotations.ApiModelProperty(value="登录用户名",name="username") private String username; - /*用户名称**/ + /**用户名称**/ @io.swagger.annotations.ApiModelProperty(value="用户名称",name="name") private String name; - /*密码**/ + /**密码**/ @io.swagger.annotations.ApiModelProperty(value="密码",name="password") private String password; - /*创建时间**/ + /**创建时间**/ @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createTime") private Date createTime; - /*最后登录时间**/ + /**最后登录时间**/ @io.swagger.annotations.ApiModelProperty(value="最后登录时间",name="lastLoginTime") private Date lastLoginTime; - /*1:有效,0:禁止登录**/ + /**1:有效,0:禁止登录**/ @io.swagger.annotations.ApiModelProperty(value="1:有效,0:禁止登录",name="status") private Integer status; - /*0 不是超管 1是超管**/ + /**0 不是超管 1是超管**/ @io.swagger.annotations.ApiModelProperty(value="0 不是超管 1是超管",name="isAdmin") private Integer isAdmin; @io.swagger.annotations.ApiModelProperty(value="昵称",name="nickName") @@ -204,14 +204,16 @@ public class MallUserInfo implements Serializable { public static enum Field { Id_ASC("`id` ASC"),Id_DESC("`id` DESC") - ,TenantId_ASC("`tenantId` ASC"),TenantId_DESC("`tenantId` DESC") + ,TenantId_ASC("`tenant_id` ASC"),TenantId_DESC("`tenant_id` DESC") ,Username_ASC("`username` ASC"),Username_DESC("`username` DESC") ,Name_ASC("`name` ASC"),Name_DESC("`name` DESC") ,Password_ASC("`password` ASC"),Password_DESC("`password` DESC") - ,CreateTime_ASC("`createTime` ASC"),CreateTime_DESC("`createTime` DESC") - ,LastLoginTime_ASC("`lastLoginTime` ASC"),LastLoginTime_DESC("`lastLoginTime` DESC") + ,CreateTime_ASC("`create_time` ASC"),CreateTime_DESC("`create_time` DESC") + ,LastLoginTime_ASC("`last_login_time` ASC"),LastLoginTime_DESC("`last_login_time` DESC") ,Status_ASC("`status` ASC"),Status_DESC("`status` DESC") - ,IsAdmin_ASC("`isAdmin` ASC"),IsAdmin_DESC("`isAdmin` DESC") + ,IsAdmin_ASC("`is_admin` ASC"),IsAdmin_DESC("`is_admin` DESC") + ,NickName_ASC("`nick_name` ASC"),NickName_DESC("`nick_name` DESC") + ,Phone_ASC("`phone` ASC"),Phone_DESC("`phone` DESC") ; private String value; Field(String value){ 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());