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

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

@@ -95,6 +95,9 @@ public class TenantAlbumMusicServiceImpl extends ServiceImpl<TenantAlbumMusicMap
 
         List<Long> musicSheetIds = tenantAlbumMusicMapper.selectMusicSheetIds(albumId, s, type, level);
 
+        if (CollectionUtils.isEmpty(musicSheetIds)){
+            throw new BizException("该声部下没有相关曲目");
+        }
         TenantAlbumMusicWrapper.StudentMusicSheetQuery musicSheetQuery = new TenantAlbumMusicWrapper.StudentMusicSheetQuery();
         musicSheetQuery.setMusicSheetIds(musicSheetIds);
         musicSheetQuery.setMusicTagId(query.getMusicTagId());

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

@@ -369,7 +369,7 @@
 		group by smcr.user_id_, DATE_FORMAT(create_time_, '%Y-%m-%d')) mprs ON mprs.user_id_ = st.user_id_
 		left join sys_user su ON st.user_id_ = su.id_
 		left join subject sb ON sb.id_ = st.subject_id_
-		where st.membership_end_time_ >= NOW()
+		where st.membership_end_time_ >= NOW() AND mprs.user_id_ = st.user_id_
 		<if test="search != null and search != ''">
 			AND su.username_ LIKE CONCAT('%',#{keyword},'%')
 		</if>