Merge branch 'saas' into master_saas

# Conflicts:
#	mec-biz/src/main/java/com/ym/mec/biz/dal/page/ClassGroupQueryInfo.java

mec-biz/src/main/java/com/ym/mec/biz/dal/page/ClassGroupQueryInfo.java

@@ -25,6 +25,9 @@ public class ClassGroupQueryInfo extends EducationBaseQueryInfo {
 
     @ApiModelProperty(value = "少于3人的线上基础技能班，大于0。异常传true、提醒传false")
     private Boolean lessThenThreeHighOnline;
+    
+    @ApiModelProperty(value = "主教老师编号", required = false)
+    private Integer mainTeacherUserId;
 
 	public Boolean getLessThenThreeHighOnline() {
 		return lessThenThreeHighOnline;
@@ -81,4 +84,12 @@ public class ClassGroupQueryInfo extends EducationBaseQueryInfo {
 	public void setDelFlag(Integer delFlag) {
 		this.delFlag = delFlag;
 	}
+
+	public Integer getMainTeacherUserId() {
+		return mainTeacherUserId;
+	}
+
+	public void setMainTeacherUserId(Integer mainTeacherUserId) {
+		this.mainTeacherUserId = mainTeacherUserId;
+	}
 }

mec-biz/src/main/resources/config/mybatis/ClassGroupMapper.xml

@@ -1555,6 +1555,9 @@
     <sql id="queryClassGroupPageSql">
         <where>
             cg.group_type_ = #{groupType} AND cg.del_flag_ = 0 AND cg.tenant_id_ = #{tenantId}
+            <if test="mainTeacherUserId != null">
+                AND cgtm.user_id_ = #{mainTeacherUserId}
+            </if>
             <if test="type != null">
                 AND type_ = #{type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
             </if>
@@ -1577,6 +1580,7 @@
     </sql>
     <select id="countClassGroup" resultType="int">
         SELECT COUNT(cg.id_) FROM class_group cg
+        left join class_group_teacher_mapper cgtm on cgtm.class_group_id_ = cg.id_ and cgtm.teacher_role_ = 'BISHOP'
         <if test="groupType == 'MUSIC'">
             LEFT JOIN music_group mg ON mg.id_ = cg.music_group_id_
         </if>
@@ -1590,6 +1594,7 @@
     </select>
     <select id="queryClassGroupPage" resultMap="ClassGroupTeachers">
         SELECT cg.*,mg.name_ music_group_name_,o.name_ organName FROM class_group cg
+        left join class_group_teacher_mapper cgtm on cgtm.class_group_id_ = cg.id_ and cgtm.teacher_role_ = 'BISHOP'
         <if test="groupType == 'MUSIC'">
             LEFT JOIN music_group mg ON mg.id_ = cg.music_group_id_
         </if>