|
|
@ -433,11 +433,7 @@ public class CMSJournalService {
|
|
|
|
if (!CollectionUtils.isEmpty(updateSongs)) {
|
|
|
|
if (!CollectionUtils.isEmpty(updateSongs)) {
|
|
|
|
List<SongInfo> songList = songDao.orderByField(updateSongs);
|
|
|
|
List<SongInfo> songList = songDao.orderByField(updateSongs);
|
|
|
|
List<JournalSong> journalSongs=journalSongDao.findByJournalNoOrderBySongNo(journalNo);
|
|
|
|
List<JournalSong> journalSongs=journalSongDao.findByJournalNoOrderBySongNo(journalNo);
|
|
|
|
//如果JournalSong 保存信息与SongInfo 一致,则不更新
|
|
|
|
|
|
|
|
if(isSameContent(songList,journalSongs)) {
|
|
|
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Map<String,String> songId2JournalSongIdMap=journalSongs.stream().collect(Collectors.toMap(JournalSong::getSongId, JournalSong::getId));
|
|
|
|
Map<String,String> songId2JournalSongIdMap=journalSongs.stream().collect(Collectors.toMap(JournalSong::getSongId, JournalSong::getId));
|
|
|
|
|
|
|
|
|
|
|
|
List<JournalSong> updatedJournalSong = new ArrayList<>();
|
|
|
|
List<JournalSong> updatedJournalSong = new ArrayList<>();
|
|
|
|