Merge branch 'zx_online_cbs' of http://git.dayaedu.com/yonge/cooleshow into develop-new

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

@@ -354,7 +354,8 @@ public class MusicSheetAuthRecordServiceImpl extends ServiceImpl<MusicSheetAuthR
         //获取待审核曲目信息
         MusicSheetAuthRecord record = this.lambdaQuery().eq(MusicSheetAuthRecord::getId, id).one();
         if(Objects.isNull(record)){
-            record = this.lambdaQuery().eq(MusicSheetAuthRecord::getMusicSheetId, id).last("LIMIT 1").one();
+            record = this.lambdaQuery().eq(MusicSheetAuthRecord::getMusicSheetId, id)
+                    .orderByDesc(MusicSheetAuthRecord::getId).last("LIMIT 1").one();
         }
         if(Objects.nonNull(record)){
             MusicSheetDetailVo sheetDetailVo = musicSheetService.getDao().auditDetail(record.getId());
@@ -392,7 +393,7 @@ public class MusicSheetAuthRecordServiceImpl extends ServiceImpl<MusicSheetAuthR
                         collect.stream().collect(Collectors.groupingBy(TeacherMusicSheetVo::getAuditStatus));
                 for (AuthStatusEnum authStatusEnum : statusEnumListMap.keySet()) {
                     List<TeacherMusicSheetVo> records = statusEnumListMap.get(authStatusEnum);
-                    List<Long> musicSheetIds = records.stream().map(e -> e.getId()).collect(Collectors.toList());
+                    List<Long> musicSheetIds = records.stream().map(e -> e.getMusicSheetId()).collect(Collectors.toList());
                     List<MusicSheetAuthRecord> recordList = this.baseMapper.findByMusicSheetIds(musicSheetIds, authStatusEnum.getCode());
                     if (CollectionUtils.isNotEmpty(recordList)){
                         Map<Long,MusicSheetAuthRecord> authRecordMap = recordList.stream()