|
@@ -76,7 +76,10 @@ public class MarkUserClassServiceImpl extends ServiceImpl<MarkUserClassMapper, M
|
|
|
MarkUserClassDetailDto markUserClassDetailDto = new MarkUserClassDetailDto();
|
|
|
markUserClassDetailDto.setMarker(marker);
|
|
|
List<MarkUserClass> markUserClasses = this.baseMapper.listMarkerClassByExamIdAndPaperNumberAndUserId(examId, paperNumber, marker.getUserId());
|
|
|
- markUserClassDetailDto.setMarkerClassList(markUserClasses.stream().map(MarkUserClass::getClassName).collect(Collectors.toList()));
|
|
|
+ // 剔除掉已经更名的班级
|
|
|
+ List<String> markUserClassSelectList = markUserClasses.stream().map(MarkUserClass::getClassName).collect(Collectors.toList());
|
|
|
+ List<String> intersectionList = (List<String>) CollectionUtils.intersection(paperNumberClassList, markUserClassSelectList);
|
|
|
+ markUserClassDetailDto.setMarkerClassList(intersectionList);
|
|
|
markUserClassDetailDtos.add(markUserClassDetailDto);
|
|
|
}
|
|
|
markUserClassDto.setMarkerClass(markUserClassDetailDtos);
|