Merge branch 'online'

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/MusicSheetServiceImpl.java

@@ -319,9 +319,9 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
     public IPage<MusicSheetVo> selectStudentPage(IPage<MusicSheetVo> page, StudentMusicSheetSearch query) {
     	List<MusicSheetVo> records = baseMapper.selectStudentMusicPage(page, query);
     	
-    	if(query.getMyself() == false){//首页
+    	if(query.getMyself() != null && query.getMyself() == false){//首页
         	if(records == null || records.size() == 0){
-        		query.setSubjectIdList(null);
+        		query.setSubjectIds(null);
         		records = baseMapper.selectStudentMusicPage(page, query);
         	}
     	}