| | |
| | | sgProgressReportVO.setDeviceName("");} |
| | | List<SgReportUserDO> list = new LambdaQueryChainWrapper<>(sgReportUserMapper).eq(SgReportUserDO::getReportId,id).orderByAsc(SgReportUserDO::getApprovalOrder).list(); |
| | | List<Long> ids = list.stream().map(SgReportUserDO::getUserId).collect(Collectors.toList()); |
| | | List<Long> idsCounty = list.stream().filter(s->s.getRoleId().equals(1811657352658042882L)).map(SgReportUserDO::getUserId).collect(Collectors.toList()); |
| | | List<Long> rids = list.stream().map(SgReportUserDO::getRoleId).collect(Collectors.toList()); |
| | | List<Map<String,Object>> users = sgProgressReportMapper.getUserByIds(ids); |
| | | List<Map<String,Object>> usersCounty = sgProgressReportMapper.getUserByIdsCounty(idsCounty); |
| | | users.addAll(usersCounty); |
| | | List<Map<String,Object>> roles = sgProgressReportMapper.getRoleByIds(rids); |
| | | |
| | | for (Map<String, Object> user : users) { |