Merge branch 'zouxuan_saas_2022_0606' of http://git.dayaedu.com/yonge/mec into master_saas

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

@@ -1431,7 +1431,9 @@
     <select id="countStudentBasicInfo" resultType="java.lang.Integer">
         SELECT COUNT(s.user_id_) FROM student s
         LEFT JOIN sys_user su ON su.id_ = s.user_id_
-        LEFT JOIN student_registration sr ON sr.user_id_ = s.user_id_
+        <if test="musicGroupId != null and musicGroupId != ''">
+            LEFT JOIN student_registration sr ON sr.user_id_ = s.user_id_
+        </if>
         <include refid="queryStudentBasicInfoSql"/>
     </select>
     <select id="queryStudentBasicInfo" resultMap="SysUserDto">
@@ -1439,7 +1441,9 @@
         LEFT JOIN sys_user su ON su.id_ = s.user_id_
         LEFT JOIN organization o ON o.id_ = su.organ_id_
         LEFT JOIN `subject` sb ON sb.id_ = s.subject_id_list_
-        LEFT JOIN student_registration sr ON sr.user_id_ = s.user_id_
+        <if test="musicGroupId != null and musicGroupId != ''">
+            LEFT JOIN student_registration sr ON sr.user_id_ = s.user_id_
+        </if>
         <include refid="queryStudentBasicInfoSql"/>
         <include refid="global.limit"/>
     </select>

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

@@ -1468,7 +1468,7 @@
                 AND FIND_IN_SET(#{subjectId},t.subject_id_)
             </if>
             <if test="imGroupId != null and imGroupId != ''">
-                AND s.user_id_ NOT IN (SELECT user_id_ FROM im_group_member WHERE im_group_id_ = #{imGroupId})
+                AND t.id_ NOT IN (SELECT user_id_ FROM im_group_member WHERE im_group_id_ = #{imGroupId})
             </if>
         </where>
     </sql>