refactor(zy): 修复分页查询错误问题
This commit is contained in:
@@ -54,19 +54,14 @@ class Circle extends Base
|
||||
$friend = Relation::where('user_id', $this->auth->id)->where('status', 'IN', explode(',', $params['friend']))->column('target_id');
|
||||
$query->where('c.user_id', 'IN', $friend);
|
||||
}
|
||||
if (isset($params['page'])) {
|
||||
$pageSize = intval($params['pageSize'] ?? 10);
|
||||
$offeset = (intval($params['page']) - 1) * $pageSize;
|
||||
$query->limit($offeset, $pageSize);
|
||||
}
|
||||
$res = $query->select();
|
||||
foreach ($res as &$r) {
|
||||
$res = $query->paginate($params['pageSize'] ?? 10);
|
||||
$list = $res->items();
|
||||
foreach ($list as &$r) {
|
||||
$r['likes'] = json_decode($r['likes'], true);
|
||||
if (count($r['likes']) == 1 && empty($r['likes'][0]['id'])) $r['likes'] = [];
|
||||
$r['comment'] = buildTree(json_decode($r['comment'], true));
|
||||
}
|
||||
|
||||
$this->success('Success', ['list' => $res, 'count' => $query->count()]);
|
||||
$this->success('Success', ['list' => $list, 'count' => $res->total()]);
|
||||
}
|
||||
|
||||
public function view()
|
||||
|
||||
Reference in New Issue
Block a user