Merge branch 'dev_1_3_3_20220822'

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

@@ -114,7 +114,7 @@ public class VideoLessonGroupServiceImpl extends ServiceImpl<VideoLessonGroupDao
             }else if(query.getAuditStatus().equals(AuthStatusEnum.PASS.getCode())){
                 query.setShelvesFlag(1);
             }else{
-            	query.setShelvesFlag(0);
+            	query.setShelvesFlag(null);
             }
         }
         return page.setRecords(baseMapper.selectPage(page, query));
@@ -381,6 +381,8 @@ public class VideoLessonGroupServiceImpl extends ServiceImpl<VideoLessonGroupDao
     public void update(VideoLessonVo lessonVo, SysUser sysUser) {
         VideoLessonGroup lessonGroup = lessonVo.getLessonGroup();
         List<VideoLessonGroupDetail> lessonList = lessonVo.getLessonList();
+        lessonGroup.setLessonCount(lessonList.size());
+        lessonGroup.setTeacherId(sysUser.getId());
         //判断是否有正在审核中
         QueryWrapper<VideoLessonAuthRecord> wrapper = new QueryWrapper<VideoLessonAuthRecord>();
         wrapper.eq("video_group_id_", lessonGroup.getId()).eq("audit_status_", AuthStatusEnum.DOING.getCode());
@@ -432,10 +434,12 @@ public class VideoLessonGroupServiceImpl extends ServiceImpl<VideoLessonGroupDao
         lessonGroup.setUpdateTime(date);
         videoLessonGroupDao.updateById(lessonGroup);
         
+        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/VideoLessonGroupMapper.xml

@@ -471,9 +471,9 @@
 			g.create_time_ AS createTime,
 			g.update_time_ AS updateTime,
 			g.audit_version_ as auditVersion,
-			r.audit_id_ AS auditId,
-			r.audit_name_ AS auditName,
-			r.audit_status_ AS auditStatus,
+			g.audit_id_ AS auditId,
+			g.audit_name_ AS auditName,
+			g.audit_status_ AS auditStatus,
 			r.version_ as version,
 			r.video_group_id_ as videoGroupId,
 			r.remarks as remarks,