jinpengyong
2021-08-09 2cf0253cf25e8e74958075eb3d1a1b8eac70356d
去除员工管理菜单。角色分配唯一
2 files modified
20 ■■■■ changed files
screen-api/src/main/java/com/moral/api/service/impl/UserGroupServiceImpl.java 19 ●●●● patch | view | raw | blame | history
screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java 1 ●●●● patch | view | raw | blame | history
screen-api/src/main/java/com/moral/api/service/impl/UserGroupServiceImpl.java
@@ -53,29 +53,28 @@
    public void allotGroups(Map<String, Object> parameters) {
        HttpServletRequest request = ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest();
        String token = request.getHeader("token");
        Object o = parameters.get("groupId");
        Integer userId = Integer.parseInt(parameters.get("userId").toString());
        List<Integer> groupIds = (ArrayList) parameters.get("groupIds");
        Map<String, Object> currentUserInfo = (Map<String, Object>) TokenUtils.getUserInfoByToken(token);
        Map<String, Object> orgInfo = (Map<String, Object>) currentUserInfo.get("organization");
        UpdateWrapper<UserGroup> deleteWrapper = new UpdateWrapper<>();
        deleteWrapper.eq("user_id", userId);
        userGroupMapper.delete(deleteWrapper);
        List<String> groups = new ArrayList<>();
        if (!ObjectUtils.isEmpty(groupIds)) {
            groupIds.forEach(groupId -> {
                groups.add(groupMapper.selectById(groupId).getGroupName());
        if (!ObjectUtils.isEmpty(o)) {
            int groupId = Integer.parseInt(o.toString());
            String groupName = groupMapper.selectById(groupId).getGroupName();
                UserGroup userGroup = new UserGroup();
                userGroup.setUserId(userId);
                userGroup.setGroupId(groupId);
                userGroup.setOrganizationId((Integer) orgInfo.get("id"));
            //user_group表insert
                userGroupMapper.insert(userGroup);
            });
        }
        //日志
        String account = userMapper.selectById((Integer) parameters.get("userId")).getAccount();
        String content = "给用户:" + account + "分配了组:" + groups;
            String content = "给用户:" + account + "分配了组:" + groupName;
        operationLogUtils.insertLog(request, content, Constants.UPDATE_OPERATE_TYPE);
    }
}
}
screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java
@@ -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<>();