|
@@ -71,7 +71,13 @@ public class ImGroupMemberServiceImpl extends ServiceImpl<ImGroupMemberDao, ImGr
|
|
|
this.baseMapper.insert(imGroupMember);
|
|
|
//加入融云群
|
|
|
List<GroupMember> groupMemberList = new ArrayList<>();
|
|
|
- groupMemberList.add(new GroupMember(userId.toString(),imGroupId,null));
|
|
|
+
|
|
|
+ String imUserId = String.valueOf(userId);
|
|
|
+ if (ImGroupMemberRoleType.STUDENT == roleType) {
|
|
|
+ imUserId = MessageFormat.format("{0}:{1}", imUserId, ClientEnum.STUDENT.name());
|
|
|
+ }
|
|
|
+
|
|
|
+ groupMemberList.add(new GroupMember(imUserId,imGroupId,null));
|
|
|
return groupMemberList;
|
|
|
}
|
|
|
|
|
@@ -82,8 +88,17 @@ public class ImGroupMemberServiceImpl extends ServiceImpl<ImGroupMemberDao, ImGr
|
|
|
List<ImGroupMember> imGroupMembers = baseMapper.initImGroupMember(imGroupId,userIds,roleType.getCode());
|
|
|
if(CollectionUtils.isNotEmpty(imGroupMembers)){
|
|
|
baseMapper.insertBatch(imGroupMembers);
|
|
|
+
|
|
|
//加入融云群
|
|
|
- Function<Long,GroupMember> func = (userId) -> new GroupMember(userId.toString(),imGroupId,null);
|
|
|
+ Function<Long,GroupMember> func = (userId) -> {
|
|
|
+
|
|
|
+ String imUserId = String.valueOf(userId);
|
|
|
+ if (ImGroupMemberRoleType.STUDENT == roleType) {
|
|
|
+ imUserId = MessageFormat.format("{0}:{1}", imUserId, ClientEnum.STUDENT.name());
|
|
|
+ }
|
|
|
+
|
|
|
+ return new GroupMember(imUserId,imGroupId,null);
|
|
|
+ };
|
|
|
return userIds.stream().map(func).collect(Collectors.toList());
|
|
|
}
|
|
|
return new ArrayList<>();
|