lkddi/Xboard
1
0
Fork 0
mirror of https://github.com/lkddi/Xboard.git synced 2026-04-03 10:30:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #789 from socksprox/feat/or-filter-logic

Browse Source 
feat: Add OR logic support to user fetch API filters
This commit is contained in:
Xboard
2026-03-21 07:49:03 +08:00
committed by GitHub
parent 64e6d8148e 3b3fc618d6
commit b779bd4fd5
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/Http/Controllers/V2/Admin/UserController.php
View File

@@ -53,10 +53,17 @@ class UserController extends Controller
collect($request->input('filter'))->each(function ($filter) use ($builder) { collect($request->input('filter'))->each(function ($filter) use ($builder) {
$field = $filter['id']; $field = $filter['id'];
$value = $filter['value']; $value = $filter['value'];
$logic = strtolower($filter['logic'] ?? 'and');
$builder->where(function ($query) use ($field, $value) { if ($logic === 'or') {
$this->buildFilterQuery($query, $field, $value); $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);
});
}
}); });
} }