|
@@ -208,29 +208,29 @@ public class ImUserFriendServiceImpl extends BaseServiceImpl<Long, ImUserFriend>
|
|
|
// imGroupIds.add(musicGroupId);
|
|
|
if (CollectionUtils.isNotEmpty(classGroups)) {
|
|
|
imGroupIds.addAll(classGroups.stream().map(o -> o.getId().toString()).collect(Collectors.toList()));
|
|
|
- }
|
|
|
- // 获取乐团群的人员列表
|
|
|
- List<ImGroupMember> memberList = imGroupMemberDao.getByGroupId(imGroupIds);
|
|
|
- if (CollectionUtils.isNotEmpty(memberList)) {
|
|
|
- Long staffUserId = schoolStaff.getUserId();
|
|
|
- // 设置角色
|
|
|
- memberList = memberList.stream().map(o -> {
|
|
|
- if (StringUtils.isBlank(o.getRoleType())) {
|
|
|
- o.setRoleType(EFriendRoleType.STUDENT.name());
|
|
|
- } else {
|
|
|
- o.setRoleType(EFriendRoleType.getByName(o.getRoleType()).name());
|
|
|
- }
|
|
|
- return o;
|
|
|
- }).collect(Collectors.toList());
|
|
|
-
|
|
|
- // ID toMap roleType
|
|
|
- Map<Integer, String> roleTypeMap = memberList.stream().collect(Collectors.toMap(ImGroupMember::getUserId, ImGroupMember::getRoleType,(k1,k2) -> k2));
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
- Set<Integer> userIds = memberList.stream().map(ImGroupMember::getUserId)
|
|
|
- .collect(Collectors.toSet());
|
|
|
- userFriends(imUserFriends, musicGroup, staffUserId, userIds,roleTypeMap);
|
|
|
+
|
|
|
+ // 获取乐团群的人员列表
|
|
|
+ List<ImGroupMember> memberList = imGroupMemberDao.getByGroupId(imGroupIds);
|
|
|
+ if (CollectionUtils.isNotEmpty(memberList)) {
|
|
|
+ Long staffUserId = schoolStaff.getUserId();
|
|
|
+ // 设置角色
|
|
|
+ memberList = memberList.stream().map(o -> {
|
|
|
+ if (StringUtils.isBlank(o.getRoleType())) {
|
|
|
+ o.setRoleType(EFriendRoleType.STUDENT.name());
|
|
|
+ } else {
|
|
|
+ o.setRoleType(EFriendRoleType.getByName(o.getRoleType()).name());
|
|
|
+ }
|
|
|
+ return o;
|
|
|
+ }).collect(Collectors.toList());
|
|
|
+
|
|
|
+ // ID toMap roleType
|
|
|
+ Map<Integer, String> roleTypeMap = memberList.stream().collect(Collectors.toMap(ImGroupMember::getUserId, ImGroupMember::getRoleType, (k1, k2) -> k2));
|
|
|
+
|
|
|
+
|
|
|
+ Set<Integer> userIds = memberList.stream().map(ImGroupMember::getUserId)
|
|
|
+ .collect(Collectors.toSet());
|
|
|
+ userFriends(imUserFriends, musicGroup, staffUserId, userIds, roleTypeMap);
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
// 更新学校端好友列表
|