diff --git a/app/Http/Controllers/V2/Admin/UserController.php b/app/Http/Controllers/V2/Admin/UserController.php index 1e9bcf6..68cc05b 100644 --- a/app/Http/Controllers/V2/Admin/UserController.php +++ b/app/Http/Controllers/V2/Admin/UserController.php @@ -53,10 +53,17 @@ class UserController extends Controller collect($request->input('filter'))->each(function ($filter) use ($builder) { $field = $filter['id']; $value = $filter['value']; + $logic = strtolower($filter['logic'] ?? 'and'); - $builder->where(function ($query) use ($field, $value) { - $this->buildFilterQuery($query, $field, $value); - }); + if ($logic === 'or') { + $builder->orWhere(function ($query) use ($field, $value) { + $this->buildFilterQuery($query, $field, $value); + }); + } else { + $builder->where(function ($query) use ($field, $value) { + $this->buildFilterQuery($query, $field, $value); + }); + } }); }