帖子收藏

app/common/service/PostFavoriteService.php

@@ -79,10 +79,9 @@ class PostFavoriteService
     {
         $param = $request->all();
         $size = $param['size'] ?? 10;
+        $current = $param['current'] ?? 1;
         $orderField = $param['sort_by'] ?? 'post_favorites.created_at'; // 默认按收藏时间
         $orderType = in_array($param['order'],['desc','asc']) ? $param['order'] :'desc'; // 默认倒序
-        var_dump($orderType);
-        var_dump($request->user->uid);
 
         // 构建基础查询
         $query = PostFavorite::select('post_favorite.*') // 明确选择主表字段
@@ -113,7 +112,7 @@ class PostFavoriteService
 
 // 执行分页查询
 
-        $paginator = $query->paginate($size);
+        $paginator = $query->paginate($size, ['*'], 'page', $current);
 
 // 由于使用了join，需要重新手动加载关联的post数据
         $paginator->getCollection()->transform(function ($item) {
@@ -121,7 +120,12 @@ class PostFavoriteService
             return $item;
         });
 
-        return $paginator->items();
+        $res = ['records' => $paginator->items(),
+            'current' => $current ?? 1,
+            'size' => $size,
+            'total' => $query->count(),
+        ];
+        return $res;
     }
 
     /**