| 
														
															@@ -1562,12 +1562,7 @@ 
														 | 
													
												
											
												
													
														| 
														 | 
														
															                 AND type_ = #{type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler} 
														 | 
														
														 | 
														
															                 AND type_ = #{type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler} 
														 | 
													
												
											
												
													
														| 
														 | 
														
															             </if> 
														 | 
														
														 | 
														
															             </if> 
														 | 
													
												
											
												
													
														| 
														 | 
														
															             <if test="organIds != null and organIds != ''"> 
														 | 
														
														 | 
														
															             <if test="organIds != null and organIds != ''"> 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-                <if test="groupType == 'LIVE'"> 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-                    AND INTE_ARRAY(mg.organ_id_list_,#{organIds}) 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-                </if> 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-                <if test="groupType != 'LIVE'"> 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-                   AND FIND_IN_SET(mg.organ_id_,#{organIds}) 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-                </if> 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+                AND FIND_IN_SET(mg.organ_id_,#{organIds}) 
														 | 
													
												
											
												
													
														| 
														 | 
														
															             </if> 
														 | 
														
														 | 
														
															             </if> 
														 | 
													
												
											
												
													
														| 
														 | 
														
															             <if test="educationUserId != null"> 
														 | 
														
														 | 
														
															             <if test="educationUserId != null"> 
														 | 
													
												
											
												
													
														| 
														 | 
														
															                 AND mg.educational_teacher_id_ = #{educationUserId} 
														 | 
														
														 | 
														
															                 AND mg.educational_teacher_id_ = #{educationUserId} 
														 |