Merge branch 'develop' of http://git.dayaedu.com/yonge/cooleshow

cooleshow-app/src/main/java/com/yonge/cooleshow/admin/controller/TenantAlbumController.java

@@ -159,7 +159,9 @@ public class TenantAlbumController {
                 if (StringUtils.isNotBlank(musicSubject)){
                     //设置对应声部名称
                     List<Subject> subject = subjectService.findBySubjectByIdList(musicSubject);
-                    t.setMusicSubjectName(subject.get(0).getName());
+                    if (CollectionUtils.isNotEmpty(subject)) {
+                        t.setMusicSubjectName(subject.get(0).getName());
+                    }
                 }
 
 

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/TenantAlbumController.java

@@ -147,7 +147,9 @@ public class TenantAlbumController {
                 if (StringUtils.isNotBlank(musicSubject)){
                     //设置对应声部名称
                     List<Subject> subject = subjectService.findBySubjectByIdList(musicSubject);
-                    t.setMusicSubjectName(subject.get(0).getName());
+                    if (CollectionUtils.isNotEmpty(subject)) {
+                        t.setMusicSubjectName(subject.get(0).getName());
+                    }
                 }
 
 

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/StudentServiceImpl.java

@@ -579,6 +579,12 @@ public class StudentServiceImpl extends ServiceImpl<StudentDao, Student> impleme
         Long tenantId = student.getTenantId();
         this.save(student);
 
+        try {
+            imGroupCoreService.register(String.valueOf(student.getId()), ClientEnum.STUDENT.getCode(),
+                    sysUser.getUsername(),student.getAvatar());
+        } catch (Exception e) {
+            log.error("学生注册IM失败:" + e.getMessage(), e);
+        }
         // 加好友
         if (tenantId != -1) {
             // 自动与机构老师成为好友

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());
+                }
             }
 
             //是否收藏