|
@@ -160,7 +160,10 @@ public class ExamSubjectSongServiceImpl extends BaseServiceImpl<Long, ExamSubjec
|
|
|
List<String> songNames=new ArrayList<>();
|
|
|
for (String s : examSubjectSongDto.getPerformSongIdList().split(",")) {
|
|
|
if(examSongIds.contains(Integer.valueOf(s))){
|
|
|
- songNames.add(idExamSongMap.get(Integer.valueOf(s)).getSongName());
|
|
|
+ ExamSong examSong = idExamSongMap.get(Integer.valueOf(s));
|
|
|
+ if(Objects.nonNull(examSong)){
|
|
|
+ songNames.add(examSong.getSongName());
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
examSubjectSongDto.setPerformSongNames(StringUtils.join(songNames, ","));
|