Merge branch 'feature_HW_20230331' into master_saas

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

@@ -349,9 +349,9 @@
             <if test="homeWorkStatus.code == 'DEADLINE'">
                 AND expire_date_ &lt; NOW()
             </if>
-            <if test="courseScheduleId != null">
-                AND id_ = #{courseScheduleId}
-            </if>
+        </if>
+        <if test="courseScheduleId != null">
+            AND id_ = #{courseScheduleId}
         </if>
         <if test="type != null">
             and group_type_ = #{type}