From 1e26fc1ca98b19eaa9813a6ea03a0c65b1ccef39 Mon Sep 17 00:00:00 2001 From: jinpengyong <jpy123456> Date: Mon, 09 Aug 2021 11:58:35 +0800 Subject: [PATCH] update --- screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 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..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<>(); @@ -225,11 +225,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