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

@@ -272,11 +272,12 @@ public class MusicSheetAuthRecordServiceImpl extends ServiceImpl<MusicSheetAuthR
         CbsMusicSheetWrapper.AddMusicSheet addMusicSheet = this.checkRecord(musicSheetAuthRecord);
         MusicSheet musicSheet = musicSheetService.initMusicSheet(addMusicSheet);
         musicSheet.setCbsMusicSheetId(musicSheet1.getCbsMusicSheetId());
-        musicSheetService.removeById(record.getMusicSheetId());
+        musicSheet.setId(musicSheet1.getId());
+//        musicSheetService.removeById(record.getMusicSheetId());
         musicSheetAccompanimentService.delByMusicSheetId(record.getMusicSheetId());
         if(record.getAuditState() == AuthStatusEnum.DOING){
             //保存曲目信息
-            musicSheetService.save(musicSheet);
+            musicSheetService.updateById(musicSheet);
             List<MusicSheetAccompaniment> musicSheetAccompaniments = musicSheetAccompanimentService.initMusicSheetAccompaniment(musicSheetAuthRecord.getMusicSheetJson(),musicSheet.getId());
             musicSheetAccompanimentService.saveBatch(musicSheetAccompaniments);
             record.setMusicSheetId(musicSheet.getId());
@@ -284,7 +285,7 @@ public class MusicSheetAuthRecordServiceImpl extends ServiceImpl<MusicSheetAuthR
             baseMapper.updateById(record);
         }else {
             //保存曲目信息
-            musicSheetService.save(musicSheet);
+            musicSheetService.updateById(musicSheet);
             List<MusicSheetAccompaniment> musicSheetAccompaniments = musicSheetAccompanimentService.initMusicSheetAccompaniment(musicSheetAuthRecord.getMusicSheetJson(),musicSheet.getId());
             musicSheetAccompanimentService.saveBatch(musicSheetAccompaniments);
             musicSheetAuthRecord.setMusicSheetId(musicSheet.getId());

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

@@ -336,7 +336,7 @@
         left join music_sheet_accompaniment msa on msa.music_sheet_id_ = t.id_
         left join sys_user su on t.create_by_ = su.id_
         left join subject s2 on t.music_subject_ = s2.id_
-        where t.id_ = #{id}
+        where t.id_ = #{id} AND t.del_flag_ = 0
          order by  msa.sort_number_
     </select>