|
@@ -160,7 +160,7 @@ public class InternshipPlanManageParticipantServiceImpl extends MPJBaseServiceIm
|
|
|
.eq(InternshipPlanManageParticipant::getInternshipPlanManageId, dto.getInternshipPlanManageId())
|
|
.eq(InternshipPlanManageParticipant::getInternshipPlanManageId, dto.getInternshipPlanManageId())
|
|
|
.eq(InternshipPlanManageParticipant::getDeleteMark, DeleteMark.NODELETE.getCode())
|
|
.eq(InternshipPlanManageParticipant::getDeleteMark, DeleteMark.NODELETE.getCode())
|
|
|
);
|
|
);
|
|
|
- Map<Long, String> collect = participantList.stream().collect(Collectors.toMap(InternshipPlanManageParticipant::getParticipantUserId, InternshipPlanManageParticipant::getResult));
|
|
|
|
|
|
|
+ Map<Long, String> collect = participantList.stream().filter(x -> x.getResult() != null).collect(Collectors.toMap(InternshipPlanManageParticipant::getParticipantUserId, InternshipPlanManageParticipant::getResult));
|
|
|
PageOutput<InternshipPlanManageParticipantPageVo> pageOutput = ConventPage.getPageOutput(mobilePage, InternshipPlanManageParticipantPageVo.class);
|
|
PageOutput<InternshipPlanManageParticipantPageVo> pageOutput = ConventPage.getPageOutput(mobilePage, InternshipPlanManageParticipantPageVo.class);
|
|
|
for (InternshipPlanManageParticipantPageVo vo : pageOutput.getList()) {
|
|
for (InternshipPlanManageParticipantPageVo vo : pageOutput.getList()) {
|
|
|
if(collect.containsKey(vo.getId())){
|
|
if(collect.containsKey(vo.getId())){
|