修改获取友情链接列表的接口

app/JsonRpc/LinkService.php

@@ -16,33 +16,27 @@ class LinkService implements LinkServiceInterface
      */
     public function getLinkList(array $data): array
     {
-            $result = Link::when($data, function ($query) use ($data) {
-                    if (isset($data['title']) && !empty($data['title'])) {
-                        $query->where('link.title', 'like', '%' . trim($data['title']) . '%');
-                    }
-                    if (isset($data['website_id']) && !empty($data['website_id'])) {
-                        $query->where('link.website_id', '=', $data['website_id']);
-                    }
-                })
-                ->leftJoin("website","website.id","link.website_id")
-                ->select("link.*","website.website_name")
-                ->limit($data['pageSize'])
-                ->offset(($data['page']-1)*$data['pageSize'])
-                ->orderBy("link.updated_at","desc")
-                ->paginate(intval($data['pageSize']),
-                    [
-                        'link.*',
-                        'website.website_name'
-                    ],
-                    'page', intval($data['page']));
-            if(empty($result)){
-                return Result::error("没有查到数据");
+        $query = Link::when($data, function ($query) use ($data) {
+            if (isset($data['title']) && !empty($data['title'])) {
+                $query->where('link.title', 'like', '%' . trim($data['title']) . '%');
             }
-            $result = [
-                'rows'=>$result->items(),
-                'count'=>$result->total()
-            ];
-            return Result::success($result);
+            if (isset($data['website_id']) && !empty($data['website_id'])) {
+                $query->where('link.website_id', '=', $data['website_id']);
+            }
+        })
+        ->leftJoin('website', 'link.website_id', '=', 'website.id')
+        ->select("link.*",'website.website_name')
+        ->orderBy("link.updated_at","desc")
+        ->orderBy("link.id");
+        $result['count'] = $query->count();
+        $result['rows'] = $query->offset(($data['page']-1)*$data['pageSize'])
+            ->limit($data['pageSize'])
+            ->get()
+            ->all();
+        if($result['count'] == 0){
+            return Result::error("没有查到数据");
+        }
+        return Result::success($result);
     }
 
     /**