Merge branch 'dev_v1.3.7_20221020'

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

@@ -624,17 +624,20 @@ public class VideoLessonGroupServiceImpl extends ServiceImpl<VideoLessonGroupDao
         authRecord.setVideoGroupId(lessonGroup.getId());
         //提交审核
         recordDao.insert(authRecord);*/
-        
-        videoLessonGroupDetailDao.deleteByGroupId(lessonGroup.getId());
-		if (lessonList != null && lessonList.size() > 0) {
-			for (VideoLessonGroupDetail detail : lessonList) {
-				detail.setVideoLessonGroupId(lessonGroup.getId());
-				detail.setTeacherId(sysUser.getId());
-				detail.setUpdateBy(sysUser.getId());
-			}
-			// 添加课程
-			videoLessonGroupDetailDao.insertVideoLesson(lessonList);
-		}
+
+        // 提交第一页不删除课程
+        if (lessonVo.getPage() == 2) {
+            videoLessonGroupDetailDao.deleteByGroupId(lessonGroup.getId());
+            if (lessonList != null && lessonList.size() > 0) {
+                for (VideoLessonGroupDetail detail : lessonList) {
+                    detail.setVideoLessonGroupId(lessonGroup.getId());
+                    detail.setTeacherId(sysUser.getId());
+                    detail.setUpdateBy(sysUser.getId());
+                }
+                // 添加课程
+                videoLessonGroupDetailDao.insertVideoLesson(lessonList);
+            }
+        }
 
 
 

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

@@ -168,6 +168,7 @@
 
     <select id="selectFavoriteNumAndMusicNum" resultType="com.yonge.cooleshow.biz.dal.vo.MusicAlbumVo">
         select
+        t.id_ as id,
         t1.num as musicSheetCount
         ,t2.num as albumFavoriteCount
         from music_album t