|
@@ -100,7 +100,7 @@ public class ImGroupMemberServiceImpl extends BaseServiceImpl<Long, ImGroupMembe
|
|
|
throw new BizException("加入群组失败：群组[{}]不存在", imGroupId);
|
|
throw new BizException("加入群组失败：群组[{}]不存在", imGroupId);
|
|
|
}
|
|
}
|
|
|
//检查用户是否已存在
|
|
//检查用户是否已存在
|
|
|
- List<Integer> existUserIdList = imGroupMemberDao.queryByImGroupIdAndUserId(imGroupId.toString(), userRoleMap.keySet().stream().map(Objects::toString)
|
|
|
|
|
|
|
+ List<Integer> existUserIdList = imGroupMemberDao.queryByImGroupIdAndUserId(imGroupId.toString(), userRoleMap.keySet().stream().filter(Objects::nonNull).map(Objects::toString)
|
|
|
.collect(Collectors.joining(","))).stream().map(e -> e.getUserId()).collect(Collectors.toList());
|
|
.collect(Collectors.joining(","))).stream().map(e -> e.getUserId()).collect(Collectors.toList());
|
|
|
|
|
|
|
|
Date date = new Date();
|
|
Date date = new Date();
|
|
@@ -212,4 +212,4 @@ public class ImGroupMemberServiceImpl extends BaseServiceImpl<Long, ImGroupMembe
|
|
|
return true;
|
|
return true;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
-}
|
|
|
|
|
|
|
+}
|
