jinpengyong
2021-08-23 3bc57d8582d3d13e7e653b0f04dd09742c3b2c15
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<>();