Merge remote-tracking branch 'origin/master'

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dao/VideoLessonGroupDao.java

@@ -41,4 +41,7 @@ public interface VideoLessonGroupDao extends BaseMapper<VideoLessonGroup> {
 
     //查询所有视频课组
     List<VideoLessonAuthGroup> queryGroupList(IPage<VideoLessonAuthGroup> page, @Param("param") VideoGroupSearch query);
+
+    //根据组id查详情
+    VideoLessonGroup selectGroupById(Long groupId);
 }

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

@@ -66,13 +66,7 @@ public class VideoLessonGroupServiceImpl extends ServiceImpl<VideoLessonGroupDao
      * @Date: 2022/4/11
      */
     public VideoLessonGroup selectGroup(Long groupId) {
-        VideoLessonGroup lessonGroup = videoLessonGroupDao.selectById(groupId);
-        Subject subject = subjectDao.selectSubjectById(lessonGroup.getLessonSubject());
-        if (subject==null){
-            throw new BizException("数据异常");
-        }
-        lessonGroup.setLessonSubjectName(subject.getName());
-        return lessonGroup;
+        return videoLessonGroupDao.selectGroupById(groupId);
     }
 
     /**

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

@@ -298,4 +298,14 @@
 		</where>
 		ORDER BY g.create_time_ DESC
 	</select>
+    <select id="selectGroupById" resultType="com.yonge.cooleshow.biz.dal.entity.VideoLessonGroup"
+            parameterType="java.lang.Long">
+		SELECT
+		<include refid="baseColumns"/>
+		s.name_ AS lessonSubjectName
+		FROM video_lesson_group g
+		LEFT JOIN `subject` s ON g.lesson_subject_=s.id_
+		WHERE g.id_=#{groupId}
+		AND s.del_flag_ = 0
+	</select>
 </mapper>