Merge remote-tracking branch 'origin/feature_HW_20230331' into feature_HW_20230331

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

@@ -4153,8 +4153,8 @@
         left join course_homework ch on cs.id_ = ch.course_schedule_id_
 
         <where>
-            <if test="param.musicGroupId != null">
-                and #{param.musicGroupId} = cs.music_group_id_
+            <if test="param.teacherId != null">
+                and (cs.teacher_id_ = #{param.teacherId} or cs.actual_teacher_id_ = #{param.teacherId})
             </if>
             <if test="param.classType != null">
                 and cs.type_ = #{param.classType}
@@ -4183,9 +4183,6 @@
                 and (ch.version_tag_ = #{param.versionTag} or ch.version_tag_ is null)
             </if>
 
-            <if test="param.teacherId != null">
-                and cs.teacher_id_ = #{param.teacherId}
-            </if>
         </where>
         <if test="param.offset != null">
             limit #{param.offset},#{param.rows}
@@ -4200,7 +4197,7 @@
 
         <where>
             <if test="param.teacherId != null">
-                and cs.teacher_id_ = #{param.teacherId}
+                and (cs.teacher_id_ = #{param.teacherId} or cs.actual_teacher_id_ = #{param.teacherId})
             </if>
             <if test="param.musicGroupId != null">
                 and #{param.musicGroupId} = cs.music_group_id_