|
@@ -2601,16 +2601,23 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
|
|
|
if (group.getStatus() == MusicGroupStatusEnum.PROGRESS) {
|
|
|
updateTeamTeacher(group, musicGroup);
|
|
|
}
|
|
|
- //乐团主管有变更
|
|
|
- if(!cooperationOrgan.getEducationUserId().equals(group.getEducationalTeacherId())){
|
|
|
- //不是导入的乐团
|
|
|
- if(musicGroupId.length() > 10){
|
|
|
- //是否有预报名的群聊
|
|
|
- ImGroup imGroup = imGroupService.get(Long.parseLong(musicGroupId));
|
|
|
- if(imGroup != null){
|
|
|
- imGroupMemberService.quit(Long.parseLong(musicGroupId),group.getEducationalTeacherId());
|
|
|
- imGroupMemberService.join(Long.parseLong(musicGroupId),cooperationOrgan.getEducationUserId(),"乐团主管",false);
|
|
|
- }
|
|
|
+ //不是导入的乐团
|
|
|
+ if(musicGroupId.length() > 10){
|
|
|
+ //是否有预报名的群聊
|
|
|
+ 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());
|
|
|
+
|
|
|
+ Map<Integer, String> userRoleMap = new HashMap<>(3);
|
|
|
+ userRoleMap.put(musicGroup.getDirectorUserId(), "乐队指导");
|
|
|
+ userRoleMap.put(musicGroup.getEducationalTeacherId(), "乐团主管");
|
|
|
+ userRoleMap.put(musicGroup.getTeamTeacherId(), "运营主管");
|
|
|
+
|
|
|
+ imGroupMemberService.quit(Long.parseLong(musicGroupId),quitUserIdList);
|
|
|
+ imGroupMemberService.join(Long.parseLong(musicGroupId),userRoleMap);
|
|
|
}
|
|
|
}
|
|
|
|