|
@@ -79,10 +79,9 @@ class BackflowService extends BaseService
|
|
|
// ->where('date', '<', $date)
|
|
// ->where('date', '<', $date)
|
|
|
|
|
|
|
|
|
|
|
|
|
-
|
|
|
|
|
if (isset($search['username']) && !empty($search['username'])) {
|
|
if (isset($search['username']) && !empty($search['username'])) {
|
|
|
$username = $search['username'];
|
|
$username = $search['username'];
|
|
|
- $query->whereHas('member', function ($query1) use ($username) {
|
|
|
|
|
|
|
+ $query->whereHas('member', function ($query1) use ($username) {
|
|
|
$query1->where('username', $username);
|
|
$query1->where('username', $username);
|
|
|
});
|
|
});
|
|
|
}
|
|
}
|
|
@@ -92,7 +91,11 @@ class BackflowService extends BaseService
|
|
|
->orderByDesc('date')
|
|
->orderByDesc('date')
|
|
|
->orderBy('status');
|
|
->orderBy('status');
|
|
|
|
|
|
|
|
- $paginator = $query->paginate($limit);
|
|
|
|
|
- return ['total' => $paginator->total(), 'data' => $paginator->items()];
|
|
|
|
|
|
|
+// $paginator = $query->paginate($limit);
|
|
|
|
|
+
|
|
|
|
|
+ $total = $query->count();
|
|
|
|
|
+ $list = $query->get()->toArray();
|
|
|
|
|
+
|
|
|
|
|
+ return ['total' => $total, 'data' => $list];
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|