From ebdacd7123e42c76cd7cb43938574cfeb0706250 Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Mon, 22 Mar 2021 09:11:36 +0800
Subject: [PATCH] 角色菜单配置
---
screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java
index d71bda7..100245f 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java
@@ -114,7 +114,9 @@
userInfo.put("organizationName", organization.getName());
userInfo.put("locationLevel", organization.getLocationLevel());
userInfo.put("groups", groups);
- userInfo.putAll(getMenus(userBo.getId(), -1));
+ Map<String, Object> map = new HashMap<>();
+ map.put("userId",userBo.getId());
+ userInfo.putAll(getMenus(map));
try {
//������token������������redis
String token = TokenUtils.getToken(userBo.getId().toString(), userInfo);
@@ -130,13 +132,13 @@
return result;
}
- //������userId������������������������
- public Map<String, Object> getMenus(int userId, int orgId) {
+ @Override
+ public Map<String, Object> getMenus(Map<String, Object> parameters) {
List<Menu> allMenus;
- if (orgId == -1) {
- allMenus = menuMapper.selectUserMenu(userId);
+ if (parameters.containsKey("userId")) {
+ allMenus = menuMapper.selectUserMenu(Integer.parseInt(parameters.get("userId").toString()));
} else {
- allMenus = menuMapper.selectOrganizationMenu(orgId);
+ allMenus = menuMapper.selectOrganizationMenu(Integer.parseInt(parameters.get("orgId").toString()));
}
Map<String, Object> resultMap = new LinkedHashMap<>();
@@ -162,7 +164,7 @@
}
//������������������������������������
- public List<Map<String, Object>> getMenusByRecursion(Menu menu, List<Menu> menus) {
+ private List<Map<String, Object>> getMenusByRecursion(Menu menu, List<Menu> menus) {
List<List<Map<String, Object>>> resultList = new ArrayList();
Menu newMenu = new Menu();
newMenu.setParentId(menu.getId());
--
Gitblit v1.8.0