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

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

@@ -2633,15 +2633,25 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
             ImGroup imGroup = imGroupService.get(Long.parseLong(musicGroupId));
             if(imGroup != null){
                 List<Integer> quitUserIdList = new ArrayList<>();
-                quitUserIdList.add(group.getTeamTeacherId());
-                quitUserIdList.add(group.getEducationalTeacherId());
-                quitUserIdList.add(group.getDirectorUserId());
-
+                if(group.getTeamTeacherId() != null){
+                    quitUserIdList.add(group.getTeamTeacherId());
+                }
+                if(group.getEducationalTeacherId() != null){
+                    quitUserIdList.add(group.getEducationalTeacherId());
+                }
+                if(group.getDirectorUserId() != null){
+                    quitUserIdList.add(group.getDirectorUserId());
+                }
                 Map<Integer, String> userRoleMap = new HashMap<>(3);
-                userRoleMap.put(musicGroup.getDirectorUserId(), "乐队指导");
-                userRoleMap.put(musicGroup.getEducationalTeacherId(), "乐团主管");
-                userRoleMap.put(musicGroup.getTeamTeacherId(), "运营主管");
-
+                if(musicGroup.getTeamTeacherId() != null){
+                    userRoleMap.put(musicGroup.getTeamTeacherId(), "运营主管");
+                }
+                if(musicGroup.getEducationalTeacherId() != null){
+                    userRoleMap.put(musicGroup.getEducationalTeacherId(), "乐团主管");
+                }
+                if(musicGroup.getDirectorUserId() != null){
+                    userRoleMap.put(musicGroup.getDirectorUserId(), "乐队指导");
+                }
                 imGroupMemberService.quit(Long.parseLong(musicGroupId),quitUserIdList);
                 imGroupMemberService.join(Long.parseLong(musicGroupId),userRoleMap);
             }