Merge branch 'cooperation_education' of http://git.dayaedu.com/yonge/mec

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

@@ -65,7 +65,7 @@ public class CooperationOrganServiceImpl extends BaseServiceImpl<Integer, Cooper
 							//是否有预报名的群聊
 							ImGroup imGroup = imGroupService.get(Long.parseLong(musicGroup.getId()));
 							if(imGroup != null){
-								imGroupMemberService.quit(Long.parseLong(musicGroup.getId()),cooperationOrgan.getEducationUserId());
+								imGroupMemberService.quit(Long.parseLong(musicGroup.getId()),musicGroup.getEducationalTeacherId());
 								imGroupMemberService.join(Long.parseLong(musicGroup.getId()),cooperationOrgan.getEducationUserId(),"乐团主管",false);
 							}
 						}

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

@@ -2634,7 +2634,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
                 //是否有预报名的群聊
                 ImGroup imGroup = imGroupService.get(Long.parseLong(musicGroupId));
                 if(imGroup != null){
-                    imGroupMemberService.quit(Long.parseLong(musicGroupId),cooperationOrgan.getEducationUserId());
+                    imGroupMemberService.quit(Long.parseLong(musicGroupId),group.getEducationalTeacherId());
                     imGroupMemberService.join(Long.parseLong(musicGroupId),cooperationOrgan.getEducationUserId(),"乐团主管",false);
                 }
             }