|  | @@ -898,11 +898,11 @@
 | 
	
		
			
				|  |  |          LEFT JOIN student_registration sr ON sr.music_group_id_ = mgpc.music_group_id_
 | 
	
		
			
				|  |  |          LEFT JOIN sys_user su ON su.id_ = sr.user_id_
 | 
	
		
			
				|  |  |          LEFT JOIN `subject` s ON s.id_ = sr.subject_id_
 | 
	
		
			
				|  |  | -        WHERE mgpc.id_ = #{musicGroupPaymentCalenderId} AND mgpc.music_group_id_ = #{musicGroupId} AND sr.music_group_status_ != 'QUIT' AND sr.user_id_ NOT IN (
 | 
	
		
			
				|  |  | +        WHERE mgpc.id_ = #{musicGroupPaymentCalenderId} AND mgpc.music_group_id_ = #{musicGroupId} AND sr.music_group_status_ = 'NORMAL' AND sr.user_id_ NOT IN (
 | 
	
		
			
				|  |  |          SELECT DISTINCT user_id_ FROM music_group_payment_calender_detail
 | 
	
		
			
				|  |  |          WHERE music_group_payment_calender_id_ = #{musicGroupPaymentCalenderId})
 | 
	
		
			
				|  |  |          <if test="search != null and search != ''">
 | 
	
		
			
				|  |  | -            AND sr.user_id_ = #{search} OR su.username_ LIKE CONCAT('%',#{search},'%')
 | 
	
		
			
				|  |  | +            AND (sr.user_id_ = #{search} OR su.username_ LIKE CONCAT('%',#{search},'%'))
 | 
	
		
			
				|  |  |          </if>
 | 
	
		
			
				|  |  |          <if test="subjectId != null">
 | 
	
		
			
				|  |  |              AND sr.subject_id_ = #{subjectId}
 |