Merge branch 'feature/0721-tenant' of http://git.dayaedu.com/yonge/cooleshow into develop

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/SysMusicCompareWeekData.java

@@ -12,6 +12,8 @@ public class SysMusicCompareWeekData extends BaseEntity {
 
 	/** 用户编号 */
 	private Long userId;
+
+	private Long tenantId = -1L;
 	
 	/** 周一日期 */
 	private java.util.Date monday;

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

@@ -135,8 +135,10 @@ public class TenantAlbumMusicServiceImpl extends ServiceImpl<TenantAlbumMusicMap
             //获取声部名
             if (StringUtils.isNotEmpty(musicSubject)){
                 List<Subject> subject = subjectService.findBySubjectByIdList(musicSubject);
-                Subject subject1 = subject.get(0);
-                m.setMusicSubjectName(subject1.getName());
+                if (CollectionUtils.isNotEmpty(subject)){
+                    Subject subject1 = subject.get(0);
+                    m.setMusicSubjectName(subject1.getName());
+                }
             }
 
             //是否收藏