|
|
@@ -73,16 +73,15 @@ class BackflowService extends BaseService
|
|
|
public static function paginate(array $search = []): array
|
|
|
{
|
|
|
$date = Carbon::now('Asia/Shanghai')->format('Y-m');
|
|
|
- $limit = isset($search['limit']) ? $search['limit'] : 15;
|
|
|
- $query = self::$MODEL::where(self::getWhere($search));
|
|
|
+ $query = static::$MODEL::where(static::getWhere($search));
|
|
|
|
|
|
// ->where('date', '<', $date)
|
|
|
|
|
|
|
|
|
if (isset($search['username']) && !empty($search['username'])) {
|
|
|
$username = $search['username'];
|
|
|
- $query->whereHas('member', function ($query1) use ($username) {
|
|
|
- $query1->where('username', $username);
|
|
|
+ $query->whereHas('member', function ($query) use ($username) {
|
|
|
+ $query->where('username', $username);
|
|
|
});
|
|
|
}
|
|
|
|
|
|
@@ -94,7 +93,7 @@ class BackflowService extends BaseService
|
|
|
// $paginator = $query->paginate($limit);
|
|
|
|
|
|
$total = $query->count();
|
|
|
- $list = $query->get()->toArray();
|
|
|
+ $list = $query->forPage($search['page'], $search['limit'])->get()->toArray();
|
|
|
|
|
|
return ['total' => $total, 'data' => $list];
|
|
|
}
|