|  | @@ -634,14 +634,12 @@
 | 
	
		
			
				|  |  |      </update>
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |      <select id="findStudentByMusicGroupIdAndUserId" resultMap="StudentRegistration">
 | 
	
		
			
				|  |  | -        SELECT s.name_ school_name_,s2.name_ subject_name_,mgsp.kit_group_purchase_type_ kit_group_purchase_type_,
 | 
	
		
			
				|  |  | -        mgsp.deposit_fee_, co.name_ remark_ FROM student_registration sr
 | 
	
		
			
				|  |  | +        SELECT s.name_ school_name_,s2.name_ subject_name_,co.name_ remark_ FROM student_registration sr
 | 
	
		
			
				|  |  |          LEFT JOIN music_group mg ON mg.id_ =sr.music_group_id_
 | 
	
		
			
				|  |  |          LEFT JOIN school s ON mg.school_id_ = s.id_
 | 
	
		
			
				|  |  |          LEFT JOIN subject s2 ON sr.actual_subject_id_ = s2.id_
 | 
	
		
			
				|  |  | -        LEFT JOIN music_group_subject_plan mgsp ON mgsp.subject_id_ = sr.actual_subject_id_ AND mgsp.music_group_id_ = sr.music_group_id_
 | 
	
		
			
				|  |  |          LEFT JOIN cooperation_organ co ON mg.cooperation_organ_id_ = co.id_
 | 
	
		
			
				|  |  | -        WHERE sr.music_group_id_ = #{musicGroupId} AND sr.user_id_ = #{userId} AND sr.music_group_status_ != 'QUIT' LIMIT 1
 | 
	
		
			
				|  |  | +        WHERE sr.music_group_id_ = #{musicGroupId} AND sr.user_id_ = #{userId} AND sr.payment_status_ =2 ORDER BY sr.id_ DESC LIMIT 1
 | 
	
		
			
				|  |  |      </select>
 | 
	
		
			
				|  |  |      <select id="queryStudentMusicGroup" resultType="java.lang.String">
 | 
	
		
			
				|  |  |          SELECT DISTINCT sr.music_group_id_ FROM student_registration sr
 |