diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxProjectConfigController.java b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxProjectConfigController.java index 31236bf09..11398c815 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxProjectConfigController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxProjectConfigController.java @@ -418,6 +418,11 @@ public class WxProjectConfigController extends BaseController { if(StringUtils.isBlank(userInfo.getTenantId())){ return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); } + WxMall mall = wxMallService.getByTenantId(userInfo.getTenantId()); + if(mall == null){ + return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"未找到对应的mall"); + } + userInfo.updateTenantInfo(mall); if(StringUtils.isBlank(userInfo.getUsername())){ return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxProjectConfigServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxProjectConfigServiceImpl.java index de2c19e50..860d0c5a8 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxProjectConfigServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxProjectConfigServiceImpl.java @@ -216,7 +216,7 @@ public class WxProjectConfigServiceImpl implements WxProjectConfigService { userInfoService.saveOrUpdate(userInfo); //创建角色 MallRole mallRole = new MallRole(); - mallRole.setTenantId(userInfo.getTenantId()); + mallRole.updateTenantInfo(userInfo); mallRole.setName("系统管理员"); mallRole.setAvailable("0"); mallRoleService.saveOrUpdate(mallRole); @@ -225,7 +225,7 @@ public class WxProjectConfigServiceImpl implements WxProjectConfigService { List list = mallPermissionService.getList(mallPermission); for(MallPermission m : list){ MallRolePermission mallRolePermission = new MallRolePermission(); - mallRolePermission.setTenantId(userInfo.getTenantId()); + mallRolePermission.updateTenantInfo(userInfo); mallRolePermission.setRoleId(mallRole.getId()); mallRolePermission.setPermissionId(m.getId()); mallRolePermissionService.saveOrUpdate(mallRolePermission);