|
@@ -292,11 +292,15 @@ public class ProjectMemberController {
|
|
List<ProjectMember> resultList = new ArrayList<>();
|
|
List<ProjectMember> resultList = new ArrayList<>();
|
|
if (result.isSuccess()){
|
|
if (result.isSuccess()){
|
|
List<ProjectMember> listProject = result.getResult().getRecords();
|
|
List<ProjectMember> listProject = result.getResult().getRecords();
|
|
- Map<String, List<ProjectMember>> groupByMedia = listProject.stream().filter(p-> (!Check.isNull(p.getMediaId()))).collect(Collectors.groupingBy(ProjectMember::getMediaId));
|
|
|
|
- resultList = groupByMedia.get(projectMember.getMediaId());
|
|
|
|
- resultList.stream().filter(p -> (!Check.isNull(p.getAdvertiserName()))).collect(Collectors.toList());
|
|
|
|
- resultList = resultList.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(ProjectMember :: getAdvertiserId))), ArrayList::new));
|
|
|
|
- }
|
|
|
|
|
|
+ if (!Check.isNull(listProject)){
|
|
|
|
+ Map<String, List<ProjectMember>> groupByMedia = listProject.stream().filter(p-> (!Check.isNull(p.getMediaId()))).collect(Collectors.groupingBy(ProjectMember::getMediaId));
|
|
|
|
+ resultList = groupByMedia.get(projectMember.getMediaId());
|
|
|
|
+ if (!Check.isNull(resultList)){
|
|
|
|
+ resultList.stream().filter(p -> (!Check.isNull(p.getAdvertiserName()))).collect(Collectors.toList());
|
|
|
|
+ resultList = resultList.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(ProjectMember :: getAdvertiserId))), ArrayList::new));
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ }
|
|
return Result.successMsg("成功。",resultList);
|
|
return Result.successMsg("成功。",resultList);
|
|
}
|
|
}
|
|
|
|
|