update

jinpengyong

2021-08-10 3287db59c29dff93993f2bcfc02d3ad0b08c7d97

 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);
            });
        }