Merge remote-tracking branch 'origin/master'

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

@@ -1086,8 +1086,8 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         List<BasicUserDto> teachersByStuId = musicGroupDao.findTeachersByStuId(studentId);
         //获取学员所在乐团列表
         List<String> musicGroupIds = studentRegistrationDao.queryStudentMusicGroup(studentId);
+        Set<Integer> teacherId = new HashSet<>();
         if(musicGroupIds != null && musicGroupIds.size() > 0){
-            Set<Integer> teacherId = new HashSet<>();
             List<MusicGroup> musicGroups = musicGroupDao.queryListByIds(StringUtils.join(musicGroupIds, ","));
             musicGroups.forEach(e->{
                 teacherId.add(e.getDirectorUserId());
@@ -1095,11 +1095,13 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
                 teacherId.add(e.getEducationalTeacherId());
                 teacherId.add(e.getTeamTeacherId());
             });
-            Set<Integer> collect = teachersByStuId.stream().map(e -> e.getUserId()).collect(Collectors.toSet());
-            teacherId.addAll(collect);
-            return teacherDao.queryTeacherBaseInfo(teacherId);
         }
-        return teachersByStuId;
+        Set<Integer> collect = teachersByStuId.stream().map(e -> e.getUserId()).collect(Collectors.toSet());
+        if(collect == null){
+            collect = new HashSet<>();
+        }
+        collect.addAll(teacherId);
+        return teacherDao.queryTeacherBaseInfo(collect);
     }
 
     @Override

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

@@ -266,9 +266,9 @@
     <select id="queryUserGroups" resultMap="imGroupModel">
         SELECT cg.id_,cg.name_,cg.student_num_,cg.img_,mg.name_ group_name_ FROM class_group_student_mapper cgsm
         LEFT JOIN class_group cg ON cgsm.class_group_id_ = cg.id_
-        LEFT JOIN music_group mg ON mg.id_ = cg.music_group_id_ AND cg.group_type_ = 'MUSIC'
+        LEFT JOIN music_group mg ON mg.id_ = cg.music_group_id_
         <where>
-            cg.del_flag_ = 0 AND cgsm.status_ != 'QUIT' AND mg.status_ = 'PROGRESS'
+            cg.del_flag_ = 0 AND cgsm.status_ != 'QUIT' AND (mg.status_ = 'PROGRESS' OR mg.id_ IS NULL)
             <if test="userId != null">
                 AND cgsm.user_id_ = #{userId}
             </if>
@@ -358,9 +358,9 @@
     <select id="queryTeacherGroups" resultMap="imGroupModel">
         SELECT cg.id_,cg.name_,cg.student_num_,cg.img_,mg.name_ group_name_ FROM class_group_teacher_mapper cgtm
         LEFT JOIN class_group cg ON cgtm.class_group_id_ = cg.id_
-        LEFT JOIN music_group mg ON mg.id_ = cg.music_group_id_ AND cg.group_type_ = 'MUSIC'
+        LEFT JOIN music_group mg ON mg.id_ = cg.music_group_id_
         WHERE (cgtm.user_id_ = #{userId} OR mg.team_teacher_id_ = #{userId} OR mg.educational_teacher_id_ = #{userId} OR mg.director_user_id_ = #{userId})
-         AND cg.del_flag_ = 0 AND mg.status_ = 'PROGRESS'
+         AND cg.del_flag_ = 0 AND (mg.status_ = 'PROGRESS' OR mg.id_ IS NULL)
         <if test="search != null">
             AND cg.name_ LIKE CONCAT('%',#{search},'%')
         </if>

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

@@ -257,8 +257,9 @@
 			LEFT JOIN sys_user su ON cgtm.user_id_ = su.id_
 			LEFT JOIN teacher t ON su.id_ = t.id_
 			LEFT JOIN `subject` s ON FIND_IN_SET(s.id_,t.subject_id_)
+			LEFT JOIN music_group mg ON cgsp.music_group_id_ = mg.id_
 		  WHERE
-			cgsp.user_id_ = #{studentId} AND cgsp.status_ != 'QUIT' AND cg.del_flag_ = 0
+			cgsp.user_id_ = #{studentId} AND cgsp.status_ != 'QUIT' AND cg.del_flag_ = 0 AND ((cgsp.group_type_ = 'MUSIC' AND mg.status_ = 'PROGRESS') OR cgsp.group_type_ != 'MUSIC')
 		  GROUP BY su.id_
 	</select>
 

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

@@ -266,6 +266,7 @@
         LEFT JOIN music_group mg ON mg.id_ = cgtm.music_group_id_
         WHERE (cgtm.user_id_ = #{teacherId} OR mg.team_teacher_id_ = #{teacherId} OR mg.educational_teacher_id_ = #{teacherId}
         OR director_user_id_ = #{teacherId}) AND su.id_ IS NOT NULL AND cgtm.music_group_id_ = sr.music_group_id_
+        AND (mg.status_ = 'PROGRESS' OR mg.status_ IS NULL)
         <if test="search != null">
             AND su.username_ LIKE CONCAT('%',#{search},'%')
         </if>