update

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/ClassGroupDao.java

@@ -391,6 +391,14 @@ public interface ClassGroupDao extends BaseDAO<Integer, ClassGroup> {
      * 查询对应类型所有班级列表
      *
      * @param musicGroupId
+     * @return
+     */
+    List<ClassGroup> findClassGroups(@Param("musicGroupId") String musicGroupId);
+
+    /**
+     * 查询对应类型所有班级列表
+     *
+     * @param musicGroupId
      * @param type
      * @return
      */

mec-biz/src/main/java/com/ym/mec/biz/service/impl/MusicGroupServiceImpl.java

@@ -1856,7 +1856,8 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
     }
 
     private void updateTeamTeacher(MusicGroup oldMusicGroup, MusicGroup newMusicGroup) {
-        List<ClassGroup> classGroups = classGroupDao.findClassGroupByMusicGroupIdAndType(newMusicGroup.getId(), null);
+        //获取当前乐团所有班级
+        List<ClassGroup> classGroups = classGroupDao.findClassGroups(newMusicGroup.getId());
         if (classGroups == null || classGroups.size() == 0) {
             return;
         }

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

@@ -774,6 +774,11 @@
         AND del_flag_='0'
     </select>
 
+    <select id="findClassGroups" resultMap="ClassGroup">
+        SELECT * FROM class_group WHERE music_group_id_=#{musicGroupId}
+        AND del_flag_='0' AND group_type_ NOT IN ('PRACTICE','VIP','HIGH')
+    </select>
+
     <!-- 根据合奏班id获取子班及老师 -->
     <select id="findClassGroupByMixClassGroupId" resultMap="ClassGroupTeachers">
         SELECT * FROM class_group WHERE id_ IN

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

@@ -711,7 +711,8 @@
         LEFT JOIN organization o ON su.organ_id_ = o.id_
         LEFT JOIN student_registration sr ON su.id_ = sr.user_id_ AND cssp.music_group_id_ = sr.music_group_id_
         LEFT JOIN `subject` s ON s.id_ = sr.actual_subject_id_
-        WHERE cssp.id_ IS NOT NULL AND su.user_type_ LIKE '%STUDENT%' AND (sr.music_group_status_ != 'QUIT' OR sr.id_ IS NULL)
+        WHERE cssp.id_ IS NOT NULL AND su.user_type_ LIKE '%STUDENT%'
+        AND (sr.music_group_status_ != 'QUIT' OR sr.id_ IS NULL)
         AND (mg.status_ = 'PROGRESS' OR vg.group_status_ IN (2,4))
         <if test="organId != null and organId != ''">
             AND FIND_IN_SET(su.organ_id_,#{organId})