Merge remote-tracking branch 'origin/master'

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

@@ -952,5 +952,6 @@
                 AND endTime <= #{param.endTime}
             </if>
         </where>
+        GROUP BY courseId
     </select>
 </mapper>

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

@@ -457,6 +457,7 @@
             u.avatar_ AS cover,
             g.subject_id_ AS subjectId,
             b.name_ AS subjectName,
+            ig.id_ AS imGroupId,
             (r.student_replied_ IS NOT NULL) AS studentReplied,
             (r.teacher_replied_ IS NOT NULL) AS teacherReplied
         FROM course_schedule s
@@ -464,6 +465,7 @@
         LEFT JOIN course_group g ON s.course_group_id_ = g.id_
         LEFT JOIN `subject` b ON g.subject_id_ = b.id_
         LEFT JOIN course_schedule_replied r ON s.id_ = r.course_schedule_id_
+        LEFT JOIN im_group ig ON ig.course_group_id_ = g.id_
         WHERE s.lock_=0
         AND s.status_ IN ('ING','NOT_START','COMPLETE')
         AND s.id_ IN
@@ -484,12 +486,14 @@
             g.background_pic_ AS cover,
             g.subject_id_ AS subjectId,
             sb.name_ AS subjectName,
+            ig.id_ AS imGroupId,
             (r.student_replied_ IS NOT NULL) AS studentReplied,
             (r.teacher_replied_ IS NOT NULL) AS teacherReplied
         FROM course_schedule s
         LEFT JOIN course_group g ON s.course_group_id_ = g.id_
         LEFT JOIN `subject` sb ON g.subject_id_=sb.id_
         LEFT JOIN course_schedule_replied r ON s.id_ = r.course_schedule_id_
+        LEFT JOIN im_group ig ON ig.course_group_id_ = g.id_
         WHERE s.lock_=0
         AND s.status_ IN ('ING','NOT_START','COMPLETE')
         AND s.id_ IN