|
|
@@ -77,13 +77,12 @@ class BackflowService extends BaseService
|
|
|
$page = request()->input('page', 1);
|
|
|
$limit = request()->input('limit', 10);
|
|
|
$date = Carbon::now('Asia/Shanghai')->format('Y-m');
|
|
|
- $query = static::$MODEL::where(static::getWhere($search))
|
|
|
-// ->where('date', '<', $date)
|
|
|
+ $query = static::$MODEL::where(static::getWhere($search))// ->where('date', '<', $date)
|
|
|
;
|
|
|
if (isset($search['username']) && !empty($search['username'])) {
|
|
|
$username = $search['username'];
|
|
|
- $query = $query->whereHas('user', function ($query) use ($username) {
|
|
|
- $query->where('users.username', $username);
|
|
|
+ $query = $query->whereHas('user', function ($query1) use ($username) {
|
|
|
+ $query1->where('username', $username);
|
|
|
});
|
|
|
}
|
|
|
$count = $query->count();
|