fix:后台直播课

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

@@ -540,8 +540,14 @@ public class CourseGroupServiceImpl extends ServiceImpl<CourseGroupDao, CourseGr
 
         // 获取课程组声部
         List<LiveCourseGroupVo> subjectList = baseMapper.selectCourseGroupSubject(courseGroupIdList);
-        for (int i = 0; i < records.size(); i++) {
-            records.get(i).setSubjectName(subjectList.get(i).getSubjectName());
+        Map<Long, List<LiveCourseGroupVo>> collect = subjectList.stream()
+                                .collect(Collectors.groupingBy( LiveCourseGroupVo::getCourseGroupId));
+        for (LiveCourseGroupVo record : records) {
+            List<LiveCourseGroupVo> liveCourseGroupVos = collect.get(record.getCourseGroupId());
+            if (CollectionUtils.isEmpty(liveCourseGroupVos)) {
+                continue;
+            }
+            record.setSubjectName(liveCourseGroupVos.get(0).getSubjectName());
         }
 
         return liveCourseGroupVoIPage;

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

@@ -212,12 +212,6 @@
                 </foreach>
             </if>
         </where>
-        <if test="courseGroupIdList != null and courseGroupIdList.size() != 0">
-            order by  field(cg.id_,
-            <foreach collection="courseGroupIdList" item="item" open="" close=")" separator=",">
-                #{item}
-            </foreach>
-        </if>
     </select>
 
     <select id="selectAdminLiveStudentPage" resultType="com.yonge.cooleshow.biz.dal.vo.LiveCourseGroupStudentVo">