|  | @@ -827,33 +827,30 @@
 | 
	
		
			
				|  |  |      </select>
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |      <select id="getOrgansStudentNum" resultType="map">
 | 
	
		
			
				|  |  | -        SELECT t.organ_id_ 'key',COUNT(DISTINCT user_id_) 'value'
 | 
	
		
			
				|  |  | -        FROM ((SELECT su.organ_id_,sr.user_id_
 | 
	
		
			
				|  |  | +        SELECT su.organ_id_ 'key',COUNT(DISTINCT user_id_) 'value'
 | 
	
		
			
				|  |  | +        FROM ((SELECT sr.user_id_
 | 
	
		
			
				|  |  |          FROM student_registration sr
 | 
	
		
			
				|  |  |          LEFT JOIN music_group mg ON sr.music_group_id_=mg.id_
 | 
	
		
			
				|  |  | -        LEFT JOIN sys_user su ON sr.user_id_=su.id_
 | 
	
		
			
				|  |  | -        WHERE su.del_flag_=0
 | 
	
		
			
				|  |  | -        AND mg.status_='PROGRESS'
 | 
	
		
			
				|  |  | +        WHERE mg.status_='PROGRESS'
 | 
	
		
			
				|  |  |          AND sr.music_group_status_='NORMAL')
 | 
	
		
			
				|  |  |          UNION ALL
 | 
	
		
			
				|  |  |          (SELECT
 | 
	
		
			
				|  |  | -        su.organ_id_,cssp.user_id_
 | 
	
		
			
				|  |  | +        cssp.user_id_
 | 
	
		
			
				|  |  |          FROM
 | 
	
		
			
				|  |  |          course_schedule_student_payment cssp
 | 
	
		
			
				|  |  |          LEFT JOIN course_schedule cs ON cssp.course_schedule_id_=cs.id_
 | 
	
		
			
				|  |  | -        LEFT JOIN sys_user su ON cssp.user_id_ = su.id_
 | 
	
		
			
				|  |  |          WHERE
 | 
	
		
			
				|  |  |          cssp.group_type_ IN ('VIP', 'PRACTICE')
 | 
	
		
			
				|  |  | -        AND cs.status_='NOT_START'
 | 
	
		
			
				|  |  | -        AND su.del_flag_ = 0)) t
 | 
	
		
			
				|  |  | -        WHERE 1=1
 | 
	
		
			
				|  |  | -        <if test="organIds!=null and organIds.size()>0">
 | 
	
		
			
				|  |  | -            AND t.organ_id_ IN
 | 
	
		
			
				|  |  | -            <foreach collection="organIds" item="organId" open="(" close=")" separator=",">
 | 
	
		
			
				|  |  | -                #{organId}
 | 
	
		
			
				|  |  | -            </foreach>
 | 
	
		
			
				|  |  | -        </if>
 | 
	
		
			
				|  |  | -        GROUP BY t.organ_id_
 | 
	
		
			
				|  |  | +        AND cs.status_='NOT_START')) t
 | 
	
		
			
				|  |  | +        LEFT JOIN sys_user su ON t.user_id_=su.id_
 | 
	
		
			
				|  |  | +        WHERE su.del_flag_=0
 | 
	
		
			
				|  |  | +<!--        <if test="organIds!=null and organIds.size()>0">-->
 | 
	
		
			
				|  |  | +<!--            AND su.organ_id_ IN-->
 | 
	
		
			
				|  |  | +<!--            <foreach collection="organIds" item="organId" open="(" close=")" separator=",">-->
 | 
	
		
			
				|  |  | +<!--                #{organId}-->
 | 
	
		
			
				|  |  | +<!--            </foreach>-->
 | 
	
		
			
				|  |  | +<!--        </if>-->
 | 
	
		
			
				|  |  | +        GROUP BY su.organ_id_
 | 
	
		
			
				|  |  |      </select>
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |      <select id="getOrganTeacherStudentNum" resultType="map">
 |