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

 Conflicts:

	cooleshow-user/user-biz/src/main/resources/config/mybatis/MusicAlbumMapper.xml

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

@@ -105,19 +105,22 @@ public class ImGroupMemberServiceImpl extends ServiceImpl<ImGroupMemberDao, ImGr
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public ImGroupMember getUserDetail(Long userId, String groupId) {
         ImGroupMember imGroupMember = baseMapper.findByUserIdAndGroupId(userId,groupId);
+        BasicUserInfo basicUserInfo = teacherDao.getBasicUserInfo(userId);
         if(Objects.isNull(imGroupMember)){
-            throw new BizException("当前用户不在此群组");
+            imGroupMember = new ImGroupMember();
+            imGroupMember.setGroupId(groupId);
+            imGroupMember.setUserId(userId);
         }
-        BasicUserInfo basicUserInfo = teacherDao.getBasicUserInfo(userId);
         //更新当前用户关联的该用户的详情信息
         imGroupMember.setNickname(basicUserInfo.getUsername());
         imGroupMember.setAvatar(basicUserInfo.getAvatar());
-        imGroupMember.setUpdateTime(new Date());
-        this.startTransactional(()->{
+        if(imGroupMember.getId() != null){
+            imGroupMember.setUpdateTime(new Date());
             baseMapper.updateById(imGroupMember);
-        });
+        }
         return imGroupMember;
     }
 

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

@@ -115,6 +115,9 @@ public class SubjectServiceImpl extends BaseServiceImpl<Long, Subject> implement
 
             List<Long> parentIds = subjects.stream().map(Subject::getParentSubjectId).collect(Collectors.toList());
 
+            if(CollectionUtils.isEmpty(parentIds)){
+                return subjectSelect(null);
+            }
             parents = findBySubjectByIdList(parentIds);
         }
 

cooleshow-user/user-biz/src/main/resources/config/mybatis/MusicAlbumMapper.xml

@@ -45,11 +45,11 @@
         ,(select group_concat(s.name_) from subject s
         where find_in_set(s.id_,t.subject_id_) and s.del_flag_ = 0 ) as subjectNames
         ,(select count(1) as num
-        from album_music_relate amr
-        join music_sheet ms on amr.music_sheet_id_ = ms.id_
-        left join sys_user su on su.id_ = ms.user_id_
-        where ms.del_flag_ = 0 and ms.state_ = 1 and ms.audit_status_ = 'PASS' and su.del_flag_ = 0
-        and amr.album_id_ = t.id_) as musicSheetCount
+            from album_music_relate amr
+            join music_sheet ms on amr.music_sheet_id_ = ms.id_
+            left join sys_user su on su.id_ = ms.user_id_
+            where ms.del_flag_ = 0 and ms.state_ = 1 and ms.audit_status_ = 'PASS' and su.del_flag_ = 0
+            and amr.album_id_ = t.id_) as musicSheetCount
         ,t2.num as albumFavoriteCount
         from music_album t
         left join (select count(1) as num,af.album_id_ from album_favorite af