|  | @@ -831,7 +831,7 @@
 | 
	
		
			
				|  |  |          LEFT JOIN organization o ON o.id_ = mg.organ_id_
 | 
	
		
			
				|  |  |          LEFT JOIN student_visit sv ON sv.student_id_ = sr.user_id_ AND sv.purpose_ = '会员续费'
 | 
	
		
			
				|  |  |          <include refid="queryMusicMemberListSql"/>
 | 
	
		
			
				|  |  | -        GROUP BY sr.user_id_ HAVING (MAX(cto.id_) IS NULL OR MIN(cto.status_) != 1)
 | 
	
		
			
				|  |  | +        GROUP BY sr.user_id_ HAVING (MAX(cto.id_) IS NULL OR MIN(cto.status_) > 1)
 | 
	
		
			
				|  |  |          <if test="hasMember != null">
 | 
	
		
			
				|  |  |              <if test="hasMember == 0">
 | 
	
		
			
				|  |  |                  AND (MAX(cto.id_) IS NULL OR DATEDIFF(MAX(cto.end_time_),NOW()) < 0)
 | 
	
	
		
			
				|  | @@ -863,7 +863,7 @@
 | 
	
		
			
				|  |  |          LEFT JOIN organization o ON o.id_ = mg.organ_id_
 | 
	
		
			
				|  |  |          LEFT JOIN student_visit sv ON sv.student_id_ = sr.user_id_ AND sv.purpose_ = '会员续费'
 | 
	
		
			
				|  |  |          <include refid="queryMusicMemberListSql"/>
 | 
	
		
			
				|  |  | -        GROUP BY sr.user_id_ HAVING (MAX(cto.id_) IS NULL OR MIN(cto.status_) != 1)
 | 
	
		
			
				|  |  | +        GROUP BY sr.user_id_ HAVING (MAX(cto.id_) IS NULL OR MIN(cto.status_) > 1)
 | 
	
		
			
				|  |  |          <if test="hasMember != null">
 | 
	
		
			
				|  |  |              <if test="hasMember == 0">
 | 
	
		
			
				|  |  |                  AND (MAX(cto.id_) IS NULL OR DATEDIFF(MAX(cto.end_time_),NOW()) < 0)
 |