|  | @@ -318,13 +318,14 @@
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  	<select id="getOtherStudentData" resultMap="IndexBaseMonthData">
 | 
	
		
			
				|  |  |  		SELECT
 | 
	
		
			
				|  |  | -			m.organ_id_,
 | 
	
		
			
				|  |  | +			su.organ_id_,
 | 
	
		
			
				|  |  |  			CONCAT(#{month}, '-01') month_,
 | 
	
		
			
				|  |  |  			COUNT( DISTINCT s.user_id_ ) total_num_,
 | 
	
		
			
				|  |  |  			COUNT( DISTINCT s.user_id_ ) activate_num_,
 | 
	
		
			
				|  |  |  			COUNT( DISTINCT s.user_id_ ) percent_
 | 
	
		
			
				|  |  |  		FROM
 | 
	
		
			
				|  |  | -			course_schedule_student_payment s
 | 
	
		
			
				|  |  | +		    sys_user su
 | 
	
		
			
				|  |  | +			LEFT JOIN course_schedule_student_payment s ON su.id_=s.user_id_
 | 
	
		
			
				|  |  |  			LEFT JOIN course_schedule m ON s.course_schedule_id_=m.id_
 | 
	
		
			
				|  |  |  		WHERE
 | 
	
		
			
				|  |  |  			m.del_flag_ = 0
 | 
	
	
		
			
				|  | @@ -335,9 +336,9 @@
 | 
	
		
			
				|  |  |  				AND (DATE_FORMAT(m.create_time_, '%Y-%m') <= #{month} OR YEAR(m.create_time_)=3000)
 | 
	
		
			
				|  |  |  			</if>
 | 
	
		
			
				|  |  |  		GROUP BY
 | 
	
		
			
				|  |  | -			m.organ_id_
 | 
	
		
			
				|  |  | +			su.organ_id_
 | 
	
		
			
				|  |  |  		ORDER BY
 | 
	
		
			
				|  |  | -			m.organ_id_;
 | 
	
		
			
				|  |  | +			su.organ_id_;
 | 
	
		
			
				|  |  |  	</select>
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  	<select id="getStudentConversionData" resultMap="IndexBaseMonthData">
 |