Merge branch 'feature/0427-school' into master_saas

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

@@ -705,7 +705,7 @@ public class ImGroupServiceImpl extends BaseServiceImpl<String, ImGroup> impleme
 
 
         // 查询群是否存在
-        ImGroup imGroup = imGroupDao.queryBySchoolId(cooperationOrganId.longValue());
+        ImGroup imGroup = imGroupDao.get(imGroupId);
         if (imGroup == null) {
             return;
         }

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

@@ -223,7 +223,7 @@ public class ImUserFriendServiceImpl extends BaseServiceImpl<Long, ImUserFriend>
                 usernameMap = MapUtil.convertMybatisMap(teacherDao.queryUserNameByIdList(new ArrayList<>(studentIds)));
             }
             Set<Integer> educationIds = new HashSet<>();
-            educationIds.add(musicGroup.getTeamTeacherId());
+            educationIds.add(musicGroup.getEducationalTeacherId());
 
             //学校乐团领队关联 乐团管理人员、教务、学员
 

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

@@ -1662,7 +1662,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         groupEventSource.musicGroupStudentChangeEvent(musicGroupId, StudentMusicGroupStatusEnum.NORMAL, null);
 
         ImGroupMemberWrapper.ImGroupMember build = ImGroupMemberWrapper.ImGroupMember.builder()
-                .userId(musicGroup.getTeamTeacherId().longValue())
+                .userId(musicGroup.getEducationalTeacherId().longValue())
                 .roleType(EFriendRoleType.ORCHESTRA_MANAGER.getMsg())
                 .build();
         // 乐团主管加入学校群聊