无关风月
2026-01-17 4a4d2741c5962dc0e5d7101b3435c2ab8312ff8a
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TProjectTeamServiceImpl.java
@@ -41,8 +41,30 @@
        List<String> teamIds = list.stream().map(TProjectTeamVO::getId).collect(Collectors.toList());
        List<SysUser> sysUsers = sysUserMapper.selectList();
        if(!CollectionUtils.isEmpty(teamIds)){
            List<TProjectTeamStaff> projectTeamStaffs = projectTeamStaffMapper.selectList(Wrappers.lambdaQuery(TProjectTeamStaff.class).in(TProjectTeamStaff::getTeamId, teamIds));
            list.forEach(item->{
                List<TProjectTeamStaff> projectTeamStaffList = projectTeamStaffs.stream().filter(staff -> staff.getTeamId().equals(item.getId())).collect(Collectors.toList());
                if(!CollectionUtils.isEmpty(projectTeamStaffList)){
                    List<String> staffIds = projectTeamStaffList.stream().map(TProjectTeamStaff::getUserId).collect(Collectors.toList());
                    List<SysUser> staffs = sysUsers.stream().filter(sysUser -> staffIds.contains(sysUser.getUserId()+"")).collect(Collectors.toList());
                    item.setStaffName(staffs.stream().map(SysUser::getNickName).collect(Collectors.joining(",")));
                }
                item.setStaffs(projectTeamStaffList);
            });
        }
        pageInfo.setRecords(list);
        return pageInfo;
    }
    @Override
    public PageInfo<TProjectTeamVO> pageList1(TProjectTeamQuery query) {
        PageInfo<TProjectTeamVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
        List<TProjectTeamVO> list = this.baseMapper.pageList(query,pageInfo);
        List<String> teamIds = list.stream().map(TProjectTeamVO::getId).collect(Collectors.toList());
        List<SysUser> sysUsers = sysUserMapper.selectList();
        if(!CollectionUtils.isEmpty(teamIds)){
            List<TProjectTeamStaff> projectTeamStaffs = projectTeamStaffMapper.selectList(Wrappers.lambdaQuery(TProjectTeamStaff.class)
                    .eq(TProjectTeamStaff::getRoleType,3).in(TProjectTeamStaff::getTeamId, teamIds));
                            .eq(TProjectTeamStaff::getRoleType,3)
                    .in(TProjectTeamStaff::getTeamId, teamIds));
            list.forEach(item->{
                List<TProjectTeamStaff> projectTeamStaffList = projectTeamStaffs.stream().filter(staff -> staff.getTeamId().equals(item.getId())).collect(Collectors.toList());
                if(!CollectionUtils.isEmpty(projectTeamStaffList)){