| 
					
				 | 
			
			
				@@ -1044,12 +1044,16 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         //3、将老师加入关联关系 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         List<ClassGroupTeacherMapper> classGroupTeacherMapperList = classGroup4MixDto.getClassGroupTeacherMapperList(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        classGroupTeacherMapperList.forEach(classGroupTeacherMapper -> { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            classGroupTeacherMapper.setGroupType(classGroup.getGroupType()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            classGroupTeacherMapper.setClassGroupId(classGroup.getId()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            classGroupTeacherMapper.setMusicGroupId(classGroup4MixDto.getMusicGroupId()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            userIds.add(classGroupTeacherMapper.getUserId()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        }); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        Integer teacherId = null; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        for (ClassGroupTeacherMapper groupTeacherMapper : classGroupTeacherMapperList) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            groupTeacherMapper.setGroupType(classGroup.getGroupType()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            groupTeacherMapper.setClassGroupId(classGroup.getId()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            groupTeacherMapper.setMusicGroupId(classGroup4MixDto.getMusicGroupId()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            userIds.add(groupTeacherMapper.getUserId()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            if (groupTeacherMapper.getTeacherRole().equals(TeachTypeEnum.BISHOP)) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                teacherId = groupTeacherMapper.getUserId(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         classGroupTeacherMapperDao.classGroupTeachersInsert(classGroupTeacherMapperList); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         //创建IM群组 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -1104,6 +1108,8 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 courseSchedule.setType(classGroup4MixDto.getCourseType()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 courseSchedule.setGroupType(GroupType.MUSIC); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 courseSchedule.setName(subjectNames + "-" + CourseSchedule.CourseScheduleType.SINGLE.getMsg()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                courseSchedule.setTeacherId(teacherId); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                courseSchedule.setActualTeacherId(teacherId); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 courseScheduleDao.insert(courseSchedule); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -1426,12 +1432,16 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         //3、将老师加入关联关系 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         List<ClassGroupTeacherMapper> classGroupTeacherMapperList = classGroup4MixDto.getClassGroupTeacherMapperList(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        classGroupTeacherMapperList.forEach(classGroupTeacherMapper -> { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            classGroupTeacherMapper.setGroupType(classGroup.getGroupType()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            classGroupTeacherMapper.setClassGroupId(classGroup.getId()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            classGroupTeacherMapper.setMusicGroupId(classGroup4MixDto.getMusicGroupId()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            userIds.add(classGroupTeacherMapper.getUserId()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        }); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        Integer teacherId = null; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        for (ClassGroupTeacherMapper groupTeacherMapper : classGroupTeacherMapperList) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            groupTeacherMapper.setGroupType(classGroup.getGroupType()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            groupTeacherMapper.setClassGroupId(classGroup.getId()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            groupTeacherMapper.setMusicGroupId(classGroup4MixDto.getMusicGroupId()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            userIds.add(groupTeacherMapper.getUserId()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            if (groupTeacherMapper.getTeacherRole().equals(TeachTypeEnum.BISHOP)) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                teacherId = groupTeacherMapper.getUserId(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         classGroupTeacherMapperDao.classGroupTeachersInsert(classGroupTeacherMapperList); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         //创建IM群组 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -1487,6 +1497,8 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 courseSchedule.setGroupType(GroupType.MUSIC); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 courseSchedule.setMusicGroupId(classGroup.getMusicGroupId()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 courseSchedule.setName(subjectNames + "-" + CourseSchedule.CourseScheduleType.SINGLE.getMsg()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                courseSchedule.setTeacherId(teacherId); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                courseSchedule.setActualTeacherId(teacherId); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 courseScheduleDao.insert(courseSchedule); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 |