学校端机构ID

mec-biz/src/main/java/com/ym/mec/biz/dal/enums/EFriendRoleType.java

@@ -36,10 +36,12 @@ public enum EFriendRoleType implements BaseEnum<Integer, EFriendRoleType> {
             case "SCHOOL_LEADER":
                 return SCHOOL_LEADER;
             case "TEACHER":
+            case "SCHOOL_TEACHER":
                 return SCHOOL_TEACHER;
             case "STUDENT":
                 return STUDENT;
             case "乐团主管":
+            case "ORCHESTRA_MANAGER":
                 return ORCHESTRA_MANAGER;
             case "指导老师":
                 return ORCHESTRA_TEACHER;

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

@@ -198,15 +198,14 @@ public class ImGroupServiceImpl extends BaseServiceImpl<String, ImGroup> impleme
         com.ym.mec.biz.dal.wrapper.ImGroupMemberWrapper.ImGroupMember groupMember = null;
         if (userId != null) {
             SysUser sysUser = teacherDao.getUser(userId);
-            SysUserType sysUserType = EFriendRoleType.getByName(roleType).toSysUserType();
-            groupMember = com.ym.mec.biz.dal.wrapper.ImGroupMemberWrapper.ImGroupMember
+            groupMember = ImGroupMemberWrapper.ImGroupMember
                     .builder()
                     .userId(userId.longValue())
                     .clientType("")
                     .avatar(sysUserService.getImAvatar(sysUser))
                     .nickname(sysUserService.getImName(sysUser))
                     .roleType(roleType)
-                    .tenantId(imGroup.getTenantId())
+                    .tenantId(Optional.ofNullable(imGroup.getTenantId()).orElse(TenantContextHolder.getTenantId()))
                     .isAdmin(true)
                     .build();
         }
@@ -257,17 +256,17 @@ public class ImGroupServiceImpl extends BaseServiceImpl<String, ImGroup> impleme
     }
 
     private void addImGroupMember(String groupId, List<ImGroupMember> groupMemberList) {
+        ImGroup imGroup = imGroupDao.get(groupId);
         List<com.ym.mec.biz.dal.wrapper.ImGroupMemberWrapper.ImGroupMember> imGroupMembers = Lists.newArrayList();
         for (ImGroupMember groupMember : groupMemberList) {
             SysUser user = teacherDao.getUser(groupMember.getUserId());
-            imGroupMembers.add(com.ym.mec.biz.dal.wrapper.ImGroupMemberWrapper.ImGroupMember.builder()
+            imGroupMembers.add(ImGroupMemberWrapper.ImGroupMember.builder()
                     .groupId(groupMember.getImGroupId())
                     .userId(groupMember.getUserId().longValue())
-//                    .clientType(sysUserType.name())
                     .avatar(sysUserService.getImAvatar(user))
                     .nickname(sysUserService.getImName(user))
                     .isAdmin(groupMember.getIsAdmin())
-                    .tenantId(groupMember.getTenantId())
+                    .tenantId(Optional.ofNullable(imGroup.getTenantId()).orElse(TenantContextHolder.getTenantId()))
                     .imUserId(getImUserId(groupMember.getUserId().toString(), ""))
                     .roleType(groupMember.getRoleType())
                     .build());