From e742dd813ca48cbca806130f8419150441113e3d Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 09 Aug 2021 10:27:31 +0800
Subject: [PATCH] 获取用户角色修改
---
screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 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 f8cd551..b3a584b 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,13 @@
userInfo.put("organization", orgInfo);
//���������������
- List<Map<String, Object>> groups = new ArrayList<>();
- for (Group group : userBo.getGroups()) {
- HashMap<String, Object> groupMap = new LinkedHashMap<>();
- groupMap.put("id", group.getId());
- groupMap.put("groupName", group.getGroupName());
- groups.add(groupMap);
- }
- userInfo.put("groups", groups);
+ Group group = userBo.getGroup();
+
+ HashMap<String, Object> groupMap = new LinkedHashMap<>();
+ groupMap.put("id", group.getId());
+ groupMap.put("groupName", group.getGroupName());
+
+ userInfo.put("group", groupMap);
Map<String, Object> map = new HashMap<>();
map.put("userId", userBo.getId());
@@ -187,6 +186,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<>();
--
Gitblit v1.8.0