fix:1、教师端点名列表声部显示错误；2、课程冲突检测中主教助教未进行冲突检测

mec-biz/src/main/java/com/ym/mec/biz/service/impl/CourseScheduleServiceImpl.java

@@ -1919,6 +1919,16 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
                                 backCourseSchedule.setTeachingTeacherIdList(integerAndIntegerListDto.getIds());
                             }
                         }
+                        if(CollectionUtils.isEmpty(preCourseSchedule.getTeachingTeacherIdList())){
+							preCourseSchedule.setTeachingTeacherIdList(new ArrayList<>(Arrays.asList(preCourseSchedule.getActualTeacherId())));
+						}else{
+							preCourseSchedule.getTeachingTeacherIdList().add(preCourseSchedule.getActualTeacherId());
+						}
+                        if(CollectionUtils.isEmpty(backCourseSchedule.getTeachingTeacherIdList())){
+							backCourseSchedule.setTeachingTeacherIdList(new ArrayList<>(Arrays.asList(backCourseSchedule.getActualTeacherId())));
+						}else{
+							backCourseSchedule.getTeachingTeacherIdList().add(backCourseSchedule.getActualTeacherId());
+						}
                         if (!CollectionUtils.isEmpty(preCourseSchedule.getTeachingTeacherIdList())
                                 && !CollectionUtils.isEmpty(backCourseSchedule.getTeachingTeacherIdList())) {
                             List<Integer> repeatIds = preCourseSchedule.getTeachingTeacherIdList()

mec-biz/src/main/resources/config/mybatis/SubjectMapper.xml

@@ -216,7 +216,7 @@
             s.name_ as 'value'
         FROM
             student_registration sr
-            LEFT JOIN `subject` s ON sr.subject_id_ = s.id_
+            LEFT JOIN `subject` s ON sr.actual_subject_id_ = s.id_
         WHERE 1=1
         AND
         <foreach collection="studentInfos" item="student" open="(" close=")" separator=" OR ">