分班bug修复

src/main/resources/mapper/banding/BandingTaskClassMapper.xml

@@ -22,7 +22,7 @@
         LEFT JOIN base_major_set t2 ON t1.major_set_id = t2.id
         LEFT JOIN xjr_user t3 ON t1.teacher_id = t3.id
         LEFT JOIN base_classroom t4 ON t1.classroom_id = t4.id
-        LEFT JOIN banding_task_major_condition t5 ON t1.major_set_id = t5.major_set_id
+        LEFT JOIN banding_task_major_condition t5 ON t1.major_set_id = t5.major_set_id AND t5.delete_mark = 0
         WHERE t1.delete_mark = 0 and t1.banding_task_id = #{dto.bandingTaskId}
     </select>
 
@@ -69,7 +69,7 @@
             AND t1.stduy_status = #{dto.stduyStatus}
         </if>
         <if test="dto.status != null">
-            AND t3.status = #{dto.status}
+            AND t2.status = #{dto.status}
         </if>
         <if test="dto.className != null and dto.className != ''">
             AND t3.name like concat('%', #{dto.className}, '%')