shangke 2 years ago
parent
commit
d91d7cffe6

+ 2 - 0
mec-biz/src/main/java/com/ym/mec/biz/service/impl/ImLiveBroadcastRoomMemberServiceImpl.java

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