diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/sys/HomeController.java b/mallinkAdmin/src/main/java/com/iformall/controller/sys/HomeController.java index d5dfd17fb..497c80a9d 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/sys/HomeController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/sys/HomeController.java @@ -154,10 +154,7 @@ public class HomeController extends BaseController { unameCookie.setMaxAge(3600); response.addCookie(unameCookie); - Map map = new HashMap(); - map.put("withWechat", info.getWithWechat()); - map.put("username", info.getUsername()); - data.data = map; + data.data = info; MallUserAction action = new MallUserAction(); action.setTenantId(info.getTenantId()); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/sys/MallUserInfoController.java b/mallinkAdmin/src/main/java/com/iformall/controller/sys/MallUserInfoController.java index 87423c14c..b4226cac1 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/sys/MallUserInfoController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/sys/MallUserInfoController.java @@ -13,6 +13,7 @@ import com.iformall.enums.EnumFlowPermissionType; import com.iformall.service.*; import com.iformall.shiro.PasswordHelper; import com.iformall.shiro.UserSession; +import com.iformall.utils.Constant; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -297,7 +298,6 @@ public class MallUserInfoController extends BaseController { info.protectInfos(); // TODO 请用 /menu/nav 获取菜单及权限 - /* if(info.getTenantId().equalsIgnoreCase(Constant.FM_SYS_ADMIN)) { if(info.getIsAdmin().equals(EnumUserAdmin.ADMIN.getCode())) { // 富茂系统管理员 @@ -335,7 +335,6 @@ public class MallUserInfoController extends BaseController { info.setMenus(menus); } } - */ return new ResultData(info); } 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 57e34a308..44c5b7d46 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/MallUserInfo.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/MallUserInfo.java @@ -276,6 +276,9 @@ public class MallUserInfo implements Serializable { } public boolean isFmSuperAdmin() { + if(StringUtils.isBlank(tenantId)) { + return false; + } if(tenantId.equalsIgnoreCase(Constant.FM_SYS_ADMIN)) { if(id.equals(Constant.SUPER_ADMIN) || isAdmin.equals(EnumUserAdmin.ADMIN.getCode())) { return true;