update

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/VideoLessonGroupLog.java

@@ -1,6 +1,9 @@
 package com.yonge.cooleshow.biz.dal.entity;
 
+import java.util.List;
+
 import org.apache.commons.lang3.builder.ToStringBuilder;
+
 import io.swagger.annotations.ApiModelProperty;
 
 /**
@@ -78,6 +81,8 @@ public class VideoLessonGroupLog {
 	@ApiModelProperty(value = "视频课明细json串",required = false)
 	private String videoDetailJson;
 	
+    private List<VideoLessonGroupDetail> videoList;
+	
 	public VideoLessonGroupLog setId(Long id){
 		this.id = id;
 		return this;
@@ -290,6 +295,14 @@ public class VideoLessonGroupLog {
 		this.videoDetailJson = videoDetailJson;
 	}
 
+	public List<VideoLessonGroupDetail> getVideoList() {
+		return videoList;
+	}
+
+	public void setVideoList(List<VideoLessonGroupDetail> videoList) {
+		this.videoList = videoList;
+	}
+
 	@Override
 	public String toString() {
 		return ToStringBuilder.reflectionToString(this);

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

@@ -513,13 +513,16 @@ public class VideoLessonGroupServiceImpl extends ServiceImpl<VideoLessonGroupDao
     @Override
     public VideoLessonAuthGroup authGroupDetil(Long videoGroupId) {
         VideoLessonAuthGroup videoLessonAuthGroup = baseMapper.authGroupDetil(videoGroupId);
+        
+        List<VideoLessonGroupDetail> details = videoLessonGroupDetailDao.queryByVideoLessonGroupId(videoGroupId);
+        videoLessonAuthGroup.setVideoList(details);
 
         //查询上一次的提交
         VideoLessonGroupLog lastDetil = videoLessonGroupLogService.queryByVideoLessonGroupId(videoGroupId, videoLessonAuthGroup.getVersion());
         videoLessonAuthGroup.setLastVideoLessonGroupLog(lastDetil);
         
         if(lastDetil != null){
-        	videoLessonAuthGroup.setVideoList(JsonUtil.parseArray(lastDetil.getVideoDetailJson(), VideoLessonGroupDetail.class));
+        	lastDetil.setVideoList(JsonUtil.parseArray(lastDetil.getVideoDetailJson(), VideoLessonGroupDetail.class));
         }
         
         return videoLessonAuthGroup;