|
@@ -122,7 +122,7 @@ public class ImLiveBroadcastRoomMemberServiceImpl extends ServiceImpl<ImLiveBroa
|
|
|
|
|
|
// 学生报名乐团
|
|
|
Map<Integer, String> musicMap = baseMapper.selectStudentMusicGroup(data).stream()
|
|
|
- .collect(Collectors.toMap(ImLiveBroadcastRoomMemberVo::getStudentId, ImLiveBroadcastRoomMemberVo::getMusicGroupName, (o, n) -> n));
|
|
|
+ .collect(Collectors.toMap(ImLiveBroadcastRoomMemberVo::getStudentId, x -> Optional.ofNullable(x.getMusicGroupName()).orElse(""), (o, n) -> n));
|
|
|
|
|
|
if (MapUtils.isNotEmpty(musicMap)) {
|
|
|
musicGroupMap.putAll(musicMap);
|
|
@@ -130,7 +130,7 @@ public class ImLiveBroadcastRoomMemberServiceImpl extends ServiceImpl<ImLiveBroa
|
|
|
|
|
|
// 学生声部名称
|
|
|
Map<Integer, String> collect = baseMapper.selectStudentSubject(studentIds).stream()
|
|
|
- .collect(Collectors.toMap(ImLiveBroadcastRoomMemberVo::getStudentId, ImLiveBroadcastRoomMemberVo::getSubName, (o, n) -> n));
|
|
|
+ .collect(Collectors.toMap(ImLiveBroadcastRoomMemberVo::getStudentId, x -> Optional.ofNullable(x.getSubName()).orElse(""), (o, n) -> n));
|
|
|
if (MapUtils.isNotEmpty(collect)) {
|
|
|
subjectMap.putAll(collect);
|
|
|
}
|