Merge remote-tracking branch 'origin/master'

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

@@ -1512,7 +1512,18 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
             groupTeacherMapper.setClassGroupId(classGroup.getId());
             groupTeacherMapper.setMusicGroupId(classGroup4MixDto.getMusicGroupId());
             if (groupTeacherMapper.getTeacherRole().equals(TeachTypeEnum.BISHOP)) {
-                teacherId = groupTeacherMapper.getUserId();
+                try {
+                    List<ClassGroupTeacherMapper> byClassGroup = classGroupTeacherMapperDao.findByClassGroup(classGroupId);
+                    byClassGroup.forEach(e->{
+                        ImGroupMember[] imGroupMembers = {new ImGroupMember(e.getUserId().toString())};
+                        imFeignService.groupQuit(new ImGroupModel(classGroupId.toString(), imGroupMembers, classGroup.getName()));
+                    });
+                    teacherId = groupTeacherMapper.getUserId();
+                    ImGroupMember[] imGroupMembers = {new ImGroupMember(teacherId.toString())};
+                    imFeignService.groupJoin(new ImGroupModel(classGroupId.toString(), imGroupMembers, classGroup.getName()));
+                }catch (Exception e){
+                    e.printStackTrace();
+                }
             }
         }