|
@@ -1521,13 +1521,21 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
|
|
|
imFeignService.groupQuit(new ImGroupModel(classGroupId.toString(), imGroupMembers, classGroup.getName()));
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
List<ClassGroupTeacherMapper> newTeacherMapperList = classGroup4MixDto.getClassGroupTeacherMapperList();
|
|
|
- newTeacherMapperList.forEach(e->{
|
|
|
- if(e.getTeacherRole() == TeachTypeEnum.BISHOP){
|
|
|
+ if(newTeacherMapperList.size() > 0){
|
|
|
+ //获取之前的班级老师
|
|
|
+ Set<Integer> groupTeacher = classGroupDao.findGroupTeacher(classGroupId);
|
|
|
+ groupTeacher.forEach(e->{
|
|
|
+ ImGroupMember[] imGroupMembers = {new ImGroupMember(e.toString())};
|
|
|
+ imFeignService.groupQuit(new ImGroupModel(classGroupId.toString(), imGroupMembers, classGroup.getName()));
|
|
|
+ });
|
|
|
+ newTeacherMapperList.forEach(e->{
|
|
|
ImGroupMember[] imGroupMembers = {new ImGroupMember(e.getUserId().toString())};
|
|
|
imFeignService.groupJoin(new ImGroupModel(classGroupId.toString(), imGroupMembers, classGroup.getName()));
|
|
|
- }
|
|
|
- });
|
|
|
+ });
|
|
|
+ }
|
|
|
+
|
|
|
if (classGroup4MixDto.getCourseAddType().equals("onlyUpdateTeacher")) {
|
|
|
List<Integer> classGroupIds = new ArrayList<Integer>();
|
|
|
classGroupIds.add(classGroupId);
|