From f7fe1893775960cb917a585fb26545e75881c48f Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Tue, 4 Dec 2018 16:07:43 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=9D=83=E9=99=90=E6=A3=80=E6=9F=A5=E6=95=B4?= =?UTF-8?q?=E7=90=86][=E6=96=B0=E5=A2=9E]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iformall/controller/HomeController.java | 58 +++++++++---------- 1 file changed, 26 insertions(+), 32 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/HomeController.java b/mallinkAdmin/src/main/java/com/iformall/controller/HomeController.java index c388e715b..5e4f9f5ec 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/HomeController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/HomeController.java @@ -109,22 +109,8 @@ public class HomeController extends BaseController { MallUserInfo info = (MallUserInfo) SecurityUtils.getSubject().getSession().getAttribute(UserSession.userInfo); info.setPassword("保密"); // System.out.println("id:"+ SecurityUtils.getSubject().getSession().getId()); - MallUserRole ur = new MallUserRole(); - ur.setUid(info.getId()); - PageInfo page = mallUserRoleService.listAsPage(ur, 1, 1); - if (page.getSize() > 0) { - Long roleId = page.getList().get(0).getRoleId(); - MallRolePermission p = new MallRolePermission(); - p.setRoleId(roleId); - p.setTenantId(info.getTenantId()); - PageInfo listAsPage = mallRolePermissionService.listAsPage(p, 1, 100); - String menus = ""; - for (MallRolePermission rp : listAsPage.getList()) { - menus += rp.getPermissionId() + ","; - } - if (menus.length() > 0) { - menus = menus.substring(0, menus.length() - 1); - } + String menus = getPermissionsByRole(info); + if(menus != null) { info.setMenus(menus); } data.data = info; @@ -134,6 +120,28 @@ public class HomeController extends BaseController { return data; } + private String getPermissionsByRole(MallUserInfo info) { + MallUserRole ur = new MallUserRole(); + ur.setUid(info.getId()); + PageInfo page = mallUserRoleService.listAsPage(ur, 1, 1); + if (page.getSize() > 0) { + Long roleId = page.getList().get(0).getRoleId(); + MallRolePermission p = new MallRolePermission(); + p.setRoleId(roleId); + p.setTenantId(info.getTenantId()); + PageInfo listAsPage = mallRolePermissionService.listAsPage(p, 1, 100); + String menus = ""; + for (MallRolePermission rp : listAsPage.getList()) { + menus += rp.getPermissionId() + ","; + } + if (menus.length() > 0) { + menus = menus.substring(0, menus.length() - 1); + } + return menus; + } + return null; + } + private boolean isInMobileAdmin(MallUserInfo user) { // 检查用户是否有 移动端数据塔台 权限 boolean isInMobile = false; @@ -193,22 +201,8 @@ public class HomeController extends BaseController { MallUserInfo info = (MallUserInfo) SecurityUtils.getSubject().getSession().getAttribute(UserSession.userInfo); info.setPassword("保密"); // System.out.println("id:"+ SecurityUtils.getSubject().getSession().getId()); - MallUserRole ur = new MallUserRole(); - ur.setUid(info.getId()); - PageInfo page = mallUserRoleService.listAsPage(ur, 1, 1); - if (page.getSize() > 0) { - Long roleId = page.getList().get(0).getRoleId(); - MallRolePermission p = new MallRolePermission(); - p.setRoleId(roleId); - p.setTenantId(info.getTenantId()); - PageInfo listAsPage = mallRolePermissionService.listAsPage(p, 1, 100); - String menus = ""; - for (MallRolePermission rp : listAsPage.getList()) { - menus += rp.getPermissionId() + ","; - } - if (menus.length() > 0) { - menus = menus.substring(0, menus.length() - 1); - } + String menus = getPermissionsByRole(info); + if(menus != null) { info.setMenus(menus); } data.data = info;