Merge remote-tracking branch 'origin/master'

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

@@ -268,7 +268,7 @@
         LEFT JOIN class_group cg ON cgsm.class_group_id_ = cg.id_
         LEFT JOIN music_group mg ON mg.id_ = cg.music_group_id_ AND cg.group_type_ = 'MUSIC'
         <where>
-            cg.del_flag_ = 0 AND cgsm.status_ != 'QUIT'
+            cg.del_flag_ = 0 AND cgsm.status_ != 'QUIT' AND mg.status_ = 'PROGRESS'
             <if test="userId != null">
                 AND cgsm.user_id_ = #{userId}
             </if>
@@ -359,7 +359,8 @@
         SELECT cg.id_,cg.name_,cg.student_num_,cg.img_,mg.name_ group_name_ FROM class_group_teacher_mapper cgtm
         LEFT JOIN class_group cg ON cgtm.class_group_id_ = cg.id_
         LEFT JOIN music_group mg ON mg.id_ = cg.music_group_id_ AND cg.group_type_ = 'MUSIC'
-        WHERE (cgtm.user_id_ = #{userId} OR mg.team_teacher_id_ = #{userId} OR mg.educational_teacher_id_ = #{userId} OR mg.director_user_id_ = #{userId}) AND cg.del_flag_ = 0
+        WHERE (cgtm.user_id_ = #{userId} OR mg.team_teacher_id_ = #{userId} OR mg.educational_teacher_id_ = #{userId} OR mg.director_user_id_ = #{userId})
+         AND cg.del_flag_ = 0 AND mg.status_ = 'PROGRESS'
         <if test="search != null">
             AND cg.name_ LIKE CONCAT('%',#{search},'%')
         </if>

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

@@ -258,7 +258,7 @@
 			LEFT JOIN teacher t ON su.id_ = t.id_
 			LEFT JOIN `subject` s ON FIND_IN_SET(s.id_,t.subject_id_)
 		  WHERE
-			cgsp.user_id_ = #{studentId} AND cgsp.status_ != 'QUIT'
+			cgsp.user_id_ = #{studentId} AND cgsp.status_ != 'QUIT' AND cg.del_flag_ = 0
 		  GROUP BY su.id_
 	</select>
 
@@ -300,7 +300,7 @@
 		LEFT JOIN class_group cg ON mg.id_ = cg.music_group_id_
 		LEFT JOIN class_group_teacher_mapper cgtm ON cg.id_ = cgtm.class_group_id_
 		WHERE (cgtm.user_id_ = #{userId} OR mg.team_teacher_id_ = #{userId} OR mg.educational_teacher_id_ = #{userId}
-		 OR director_user_id_ = #{userId}) AND mg.status_ IN ('APPLY','PAY','PREPARE','PROGRESS')
+		 OR director_user_id_ = #{userId}) AND mg.status_ = 'PROGRESS'
 		<if test="search != null and search != ''">
 			AND mg.name_ LIKE CONCAT('%',#{search},'%')
 		</if>

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

@@ -601,6 +601,7 @@
     </select>
     <select id="queryStudentMusicGroup" resultType="java.lang.String">
         SELECT DISTINCT sr.music_group_id_ FROM student_registration sr
-        WHERE sr.user_id_ = #{studentId} AND sr.music_group_status_ != 'QUIT'
+        LEFT JOIN music_group mg ON sr.music_group_id_ = mg.id_
+        WHERE sr.user_id_ = #{studentId} AND sr.music_group_status_ != 'QUIT' AND mg.status_ = 'PROGRESS'
     </select>
 </mapper>