From e4ebf74baef4faab3fa794c042e2921437525e6e Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 12 Aug 2021 10:40:52 +0800
Subject: [PATCH] update
---
screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java | 15 ++++++++-------
1 files changed, 8 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 12dad29..87ca042 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
@@ -139,14 +139,14 @@
userInfo.put("organization", orgInfo);
//���������������
- List<Map<String, Object>> groups = new ArrayList<>();
- for (Group group : userBo.getGroups()) {
- HashMap<String, Object> groupMap = new LinkedHashMap<>();
+ Group group = userBo.getGroup();
+ Map<String, Object> groupMap = new LinkedHashMap<>();
+ userInfo.put("group", groupMap);
+ if (group != null) {
groupMap.put("id", group.getId());
groupMap.put("groupName", group.getGroupName());
- groups.add(groupMap);
+ userInfo.put("group", groupMap);
}
- userInfo.put("groups", groups);
Map<String, Object> map = new HashMap<>();
map.put("userId", userBo.getId());
@@ -187,6 +187,7 @@
allMenus = menuMapper.selectUserMenu(Integer.parseInt(parameters.get("userId").toString()));
} else {
allMenus = menuMapper.selectOrganizationMenu(Integer.parseInt(parameters.get("orgId").toString()));
+ allMenus.removeIf(m -> "������������".equals(m.getName()));
}
Map<String, Object> resultMap = new LinkedHashMap<>();
@@ -225,11 +226,11 @@
nextLevelMenus.forEach(o -> {
Map<String, Object> menuMap = new LinkedHashMap<>();
menuMap.put("id", o.getId());
- menuMap.put("name", o.getName());
+ menuMap.put("label", o.getName());
menuMap.put("url", o.getUrl());
menuMap.put("icon", o.getIcon());
//���������������
- menuMap.put("child", getMenusByRecursion(o, menus));
+ menuMap.put("children", getMenusByRecursion(o, menus));
list.add(menuMap);
});
}
--
Gitblit v1.8.0