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 b4226cac1..b67fa5f53 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/sys/MallUserInfoController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/sys/MallUserInfoController.java @@ -298,43 +298,18 @@ 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())) { - // 富茂系统管理员 + List menuList = mallPermissionService.queryAdminMenuList(info); + StringBuilder sb = new StringBuilder(); + boolean bFirst = true; + for(Long id: menuList) { + if(bFirst) { + sb.append(id); + bFirst = false; } else { - // 富茂普通管理员 - } - } else if (info.getIsAdmin().equals(EnumUserAdmin.ADMIN.getCode())) { - // 各商场超管 - MallUserInfo q = new MallUserInfo(); - q.setId(info.getId()); - List list = mallPermissionService.getUserMenuList(q); - String menus = ""; - for (MallPermission rp : list) { - menus += rp.getId() + ","; - } - if (menus.length() > 0) { - menus = menus.substring(0, menus.length() - 1); - } - info.setMenus(menus); - } else { - MallUserRole mur = mallUserRoleService.getByUid(info.getId()); - if (mur != null) { - Long roleId = mur.getRoleId(); - MallRolePermission p = new MallRolePermission(); - p.setRoleId(roleId); - p.setTenantId(info.getTenantId()); - List mrpList = mallRolePermissionService.getList(p); - String menus = ""; - for (MallRolePermission rp : mrpList) { - menus += rp.getPermissionId() + ","; - } - if (menus.length() > 0) { - menus = menus.substring(0, menus.length() - 1); - } - info.setMenus(menus); + sb.append(',').append(id); } } + info.setMenus(sb.toString()); return new ResultData(info); } diff --git a/mallinkAdmin/src/main/java/com/iformall/tenant/TenantInfoImpl.java b/mallinkAdmin/src/main/java/com/iformall/tenant/TenantInfoImpl.java index 78109fa81..3755b59b2 100644 --- a/mallinkAdmin/src/main/java/com/iformall/tenant/TenantInfoImpl.java +++ b/mallinkAdmin/src/main/java/com/iformall/tenant/TenantInfoImpl.java @@ -27,6 +27,9 @@ public class TenantInfoImpl implements TenantInfo { if ("mall_permission".equals(tableName)) { return true; } + if ("mall_sale_type".equals(tableName)) { + return true; + } if ("mall_user_role".equals(tableName)) { return true; } diff --git a/mallinkBApi/src/main/java/com/iformall/tenant/TenantInfoImpl.java b/mallinkBApi/src/main/java/com/iformall/tenant/TenantInfoImpl.java index 4e16a8d89..30764d614 100644 --- a/mallinkBApi/src/main/java/com/iformall/tenant/TenantInfoImpl.java +++ b/mallinkBApi/src/main/java/com/iformall/tenant/TenantInfoImpl.java @@ -31,6 +31,9 @@ public class TenantInfoImpl implements TenantInfo { if ("mall_permission".equals(tableName)) { return true; } + if ("mall_sale_type".equals(tableName)) { + return true; + } if ("mall_user_role".equals(tableName)) { return true; } diff --git a/mallinkCApi/src/main/java/com/iformall/tenant/TenantInfoImpl.java b/mallinkCApi/src/main/java/com/iformall/tenant/TenantInfoImpl.java index 5b1690f3a..5ddafb769 100644 --- a/mallinkCApi/src/main/java/com/iformall/tenant/TenantInfoImpl.java +++ b/mallinkCApi/src/main/java/com/iformall/tenant/TenantInfoImpl.java @@ -31,6 +31,9 @@ public class TenantInfoImpl implements TenantInfo { if ("mall_permission".equals(tableName)) { return true; } + if ("mall_sale_type".equals(tableName)) { + return true; + } if ("mall_user_role".equals(tableName)) { return true; } diff --git a/mallinkService/src/main/java/com/iformall/service/MallPermissionService.java b/mallinkService/src/main/java/com/iformall/service/MallPermissionService.java index 20a7f9bda..ceb39a974 100644 --- a/mallinkService/src/main/java/com/iformall/service/MallPermissionService.java +++ b/mallinkService/src/main/java/com/iformall/service/MallPermissionService.java @@ -28,7 +28,7 @@ public interface MallPermissionService { /** * 所有菜单 */ - List queryNotButtonList(); + List queryAdminMenuList(MallUserInfo userInfo); /** * 用户菜单 diff --git a/mallinkService/src/main/java/com/iformall/service/impl/MallPermissionServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/MallPermissionServiceImpl.java index 7a3af0bab..254a3098e 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/MallPermissionServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/MallPermissionServiceImpl.java @@ -57,8 +57,16 @@ public class MallPermissionServiceImpl implements MallPermissionService { } @Override - public List queryNotButtonList() { - return mallPermissionMapper.queryNotButtonList(); + public List queryAdminMenuList(MallUserInfo userInfo) { + if(userInfo.isFmSuperAdmin() || + userInfo.getIsAdmin().equals(EnumUserAdmin.ADMIN.getCode())) { + String menus = wxMallMapper.queryMenusByTenantId(userInfo.getTenantId()); + JSONArray menuIdList = JSON.parseArray(menus); + return menuIdList.toJavaList(Long.class); + } else { + List menuIdList = mallUserInfoMapper.queryAllMenuId(userInfo.getId()); + return menuIdList; + } } @Override @@ -67,15 +75,16 @@ public class MallPermissionServiceImpl implements MallPermissionService { // 富茂超级管理员,返回所有菜单 return getAllMenuList(null); } - if(userInfo.getIsAdmin().equals(EnumUserAdmin.ADMIN.getCode())) { + else if(userInfo.getIsAdmin().equals(EnumUserAdmin.ADMIN.getCode())) { // 租户超管 String menus = wxMallMapper.queryMenusByTenantId(userInfo.getTenantId()); JSONArray menuIdList = JSON.parseArray(menus); return getAllMenuList(menuIdList.toJavaList(Long.class)); + } else { + //用户菜单列表 + List menuIdList = mallUserInfoMapper.queryAllMenuId(userInfo.getId()); + return getAllMenuList(menuIdList); } - //用户菜单列表 - List menuIdList = mallUserInfoMapper.queryAllMenuId(userInfo.getId()); - return getAllMenuList(menuIdList); } /** diff --git a/mallinkService/src/main/resources/mapper/WxMallMapper.xml b/mallinkService/src/main/resources/mapper/WxMallMapper.xml index b8e2895f9..f1fa14138 100644 --- a/mallinkService/src/main/resources/mapper/WxMallMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMallMapper.xml @@ -138,7 +138,7 @@