fangqing 7 månader sedan
förälder
incheckning
0e56393af8

+ 4 - 1
ruoyi-generator/src/main/java/com/ruoyi/generator/controller/CommunityArticleController.java

@@ -672,9 +672,12 @@ public class CommunityArticleController extends BaseController {
     @ApiOperation("获取关注列表")
     @GetMapping("/likeUserList")
     public AjaxResult likeUserList() {
+        int pageNum = Convert.toInt(ServletUtils.getParameter("pageNum"), 1);
+        int pageSize = Convert.toInt(ServletUtils.getParameter("pageSize"), 10);
+
         List<CommunityUserLikeVo> communityUserLikeVos = null;
         try {
-            communityUserLikeVos = communityArticleService.selectCommunityUserLikeList(SecurityUtils.getLoginUser().getUserId());
+            communityUserLikeVos = communityArticleService.selectCommunityUserLikeList(SecurityUtils.getLoginUser().getUserId(),pageNum,pageSize);
         } catch (Exception e) {
             System.out.println(e.getMessage());
             throw new ProjectException();

+ 10 - 4
ruoyi-generator/src/main/java/com/ruoyi/generator/service/CommunityArticleServiceImpl.java

@@ -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));

+ 1 - 1
ruoyi-generator/src/main/java/com/ruoyi/generator/service/ICommunityArticleService.java

@@ -138,7 +138,7 @@ public interface ICommunityArticleService extends IService<CommunityArticle> {
      * @param userId 登录用户id
      * @return 当前用户关注列表
      */
-    List<CommunityUserLikeVo> selectCommunityUserLikeList(Long userId);
+    List<CommunityUserLikeVo> selectCommunityUserLikeList(Long userId,int pageNum, int pageSize);
 
     /**
      * 获取粉丝列表