瀏覽代碼

fix:曲目

liujunchi 2 年之前
父節點
當前提交
7d929a7fc7

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

@@ -38,6 +38,9 @@ public class MusicSheetAuthRecordServiceImpl extends ServiceImpl<MusicSheetAuthR
         // 替换审核id
         replaceAuthRecord(param, musicSheetAuthRecord);
         musicSheetAuthRecord.setMusicSheetId(param.getMusicSheetId());
+        if (param.getAuthStatus().equals(AuthStatusEnum.PASS)) {
+            musicSheetAuthRecord.setMusicSheetId(musicSheetAuthRecord.getOriginalMusicSheetId());
+        }
         musicSheetAuthRecord.setAuditState(param.getAuthStatus());
         musicSheetAuthRecord.setReason(param.getRemark());
         musicSheetAuthRecord.setVerifyUserId(userId);
@@ -59,7 +62,6 @@ public class MusicSheetAuthRecordServiceImpl extends ServiceImpl<MusicSheetAuthR
                 this.saveOrUpdate(record);
             }
 
-            musicSheetAuthRecord.setMusicSheetId(musicSheetAuthRecord.getOriginalMusicSheetId());
         }
     }
 

+ 3 - 0
cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/MusicSheetServiceImpl.java

@@ -421,6 +421,9 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
                                                                                                                       musicSheet.getId()))
                                                                                                               .collect(Collectors.toList());
             musicSheetAccompanimentList.addAll(originalMusicSheetAccompanimentList);
+            if (CollectionUtils.isEmpty(musicSheetAccompanimentList)) {
+                return;
+            }
             musicSheetAccompanimentService.saveOrUpdateBatch(musicSheetAccompanimentList);
         }
     }