Merge branch 'network_room' of http://git.dayaedu.com/yonge/mec into test

mec-im/src/main/java/com/ym/service/Impl/RoomServiceImpl.java

@@ -223,15 +223,15 @@ public class RoomServiceImpl implements RoomService {
             }
             //获取学员曲目下载状态
             userResult.setExamSongDownloadJson(examSongDownloadData);
-            //已下载的伴奏列表
-            if(scheduleStudentMusicScores != null && scheduleStudentMusicScores.size() > 0){
-                userResult.setScheduleStudentMusicScores(scheduleStudentMusicScores.stream().filter(e->e.getUserId() == sysUser.getId()).collect(Collectors.toList()));
-            }
             Room room = roomDao.findByRid(roomId);
             if (room != null) {
                 display = room.getDisplay();
             }
         }
+        //已下载的伴奏列表
+        if(scheduleStudentMusicScores != null && scheduleStudentMusicScores.size() > 0){
+            userResult.setScheduleStudentMusicScores(scheduleStudentMusicScores.stream().filter(e->e.getUserId() == sysUser.getId()).collect(Collectors.toList()));
+        }
 
         userResult.setUserName(userName);
         userResult.setUserId(userId);