diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/HomeController.java b/mallinkAdmin/src/main/java/com/iformall/controller/HomeController.java index 909f45bba..5bcbaab0e 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/HomeController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/HomeController.java @@ -102,19 +102,16 @@ public class HomeController extends BaseController { Subject subject = SecurityUtils.getSubject(); UsernamePasswordToken token = new UsernamePasswordToken(user.getUsername(), user.getPassword()); subject.login(token); -// List roleList = sysRoleService.findRoleByUserId(user.getId()); -// if (null != roleList && roleList.size() > 0) { -// List permissionList = sysPermissionService -// .findPermissionByRoleIds(roleList.stream().map(MallRole::getId).collect(Collectors.toList())); -// user.setRole(roleList); -// user.setPermission(permissionList); -// } MallUserInfo info = (MallUserInfo) SecurityUtils.getSubject().getSession().getAttribute(UserSession.userInfo); info.setPassword("保密"); if(StringUtils.isNotBlank(info.getBopenId())) info.setBopenId("保密"); - if(StringUtils.isNotBlank(info.getWebOpenId())) + if(StringUtils.isNotBlank(info.getWebOpenId())) { info.setWebOpenId("保密"); + info.setWithWechat(true); + } else { + info.setWithWechat(false); + } // System.out.println("id:"+ SecurityUtils.getSubject().getSession().getId()); String menus = mallUserRoleService.getPermissionsByUser(info); if(menus != null) { 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 09e80898d..adaf92f4d 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/MallUserInfo.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/MallUserInfo.java @@ -99,6 +99,9 @@ public class MallUserInfo implements Serializable { @Transient private String captcha; + @Transient + private boolean withWechat; + /**1合同审批 2账单审批**/ @io.swagger.annotations.ApiModelProperty(value="1合同审批 2账单审批",name="flowPermission") private String flowPermission; @@ -215,7 +218,15 @@ public class MallUserInfo implements Serializable { this.captcha = captcha; } - public String getPhone() { + public boolean isWithWechat() { + return withWechat; + } + + public void setWithWechat(boolean withWechat) { + this.withWechat = withWechat; + } + + public String getPhone() { return phone; }