|
@@ -16,7 +16,6 @@ class LinkService implements LinkServiceInterface
|
|
|
*/
|
|
|
public function getLinkList(array $data): array
|
|
|
{
|
|
|
- // return Result::success($data);
|
|
|
$where = [];
|
|
|
if(isset($data['title']) && !empty($data['title'])){
|
|
|
array_push($where,['link.title','like','%'.$data['title'].'%']);
|
|
@@ -33,16 +32,14 @@ class LinkService implements LinkServiceInterface
|
|
|
$query = Link::query();
|
|
|
$count = $query->count();
|
|
|
}
|
|
|
-// 重新构建查询,避免 $query 已经被修改
|
|
|
+ // 重新构建查询,避免 $query 已经被修改
|
|
|
+ $rep = $query
|
|
|
+ ->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")
|
|
|
+ ->get();
|
|
|
|
|
|
-$rep = $query
|
|
|
- ->leftJoin("website", "website.id", "link.website_id")
|
|
|
- ->select("link.*", "website.website_name")
|
|
|
- ->limit($data['pageSize'])->offset(($data['page'] - 1) * $data['pageSize'])
|
|
|
- ->orderBy("sort", "asc")
|
|
|
- ->get();
|
|
|
-// $countQuery = clone $query;
|
|
|
-// $count = $countQuery->count();
|
|
|
$result = [
|
|
|
'rows'=>$rep,
|
|
|
'count'=>$count
|