|
@@ -2,6 +2,7 @@ package com.ruoyi.generator.service;
|
|
|
|
|
|
import com.alibaba.fastjson2.JSONObject;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
|
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
|
import com.ruoyi.common.core.domain.entity.SysUser;
|
|
|
import com.ruoyi.common.core.page.TableDataInfo;
|
|
@@ -628,8 +629,13 @@ public class CommunityArticleServiceImpl extends ServiceImpl<CommunityArticleMap
|
|
|
* @return 当前用户关注列表
|
|
|
*/
|
|
|
@Override
|
|
|
- public List<CommunityUserLikeVo> selectCommunityUserLikeList(Long userId) {
|
|
|
- List<CommunityUserLike> communityUserLikes = communityUserLikeMapper.selectList(new QueryWrapper<CommunityUserLike>().eq("user_id", userId));
|
|
|
+ public List<CommunityUserLikeVo> selectCommunityUserLikeList(Long userId,int pageNum, int pageSize) {
|
|
|
+ int offset = (pageNum - 1) * pageSize;
|
|
|
+ Page<CommunityUserLike> page = new Page<>(offset, pageSize);
|
|
|
+ List<CommunityUserLike> communityUserLikes = communityUserLikeMapper.selectPage(page,new QueryWrapper<CommunityUserLike>().eq("user_id", userId)).getRecords();
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
List<CommunityUserLikeVo> communityUserLikeVos = new ArrayList<>();
|
|
|
CommunityUserLikeVo communityUserLikeVo = null;
|
|
|
for (CommunityUserLike communityUserLike : communityUserLikes) {
|
|
@@ -720,7 +726,7 @@ public class CommunityArticleServiceImpl extends ServiceImpl<CommunityArticleMap
|
|
|
@Override
|
|
|
public List<CommunityUserLikeVo> selectMutualAttention(Long userId) {
|
|
|
//先查询自己关注的人
|
|
|
- List<CommunityUserLikeVo> communityUserLikeVos = selectCommunityUserLikeList(userId);
|
|
|
+ List<CommunityUserLikeVo> communityUserLikeVos = selectCommunityUserLikeList(userId,1,10);
|
|
|
//再查询被关注的人是否关注自己
|
|
|
List<Long> likeUserIds = new ArrayList<>();
|
|
|
for (CommunityUserLikeVo communityUserLikeVo : communityUserLikeVos) {
|
|
@@ -819,7 +825,7 @@ public class CommunityArticleServiceImpl extends ServiceImpl<CommunityArticleMap
|
|
|
}
|
|
|
// 如果评论受限,则查询用户关注列表
|
|
|
if (IsComment) {
|
|
|
- List<CommunityUserLikeVo> communityUserLikeVos = communityArticleService.selectCommunityUserLikeList(articleUserId);
|
|
|
+ List<CommunityUserLikeVo> communityUserLikeVos = communityArticleService.selectCommunityUserLikeList(articleUserId,1,10);
|
|
|
// 3. 检查评论者是否在关注列表中
|
|
|
boolean isFollower = communityUserLikeVos.stream()
|
|
|
.anyMatch(like -> like.getLikeUserId().equals(userId));
|