svc-admin01/snipe-it
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

FMCS: Users API - Check for floater in results

Browse Source
This commit is contained in:
snipe
2026-06-10 11:26:41 +01:00
parent d03f68ae34
commit 53628d6ae3
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/Api/UsersController.php
+10 -1
View File
@@ -404,7 +404,16 @@ class UsersController extends Controller
if ((Setting::getSettings()->full_multiple_companies_support == '1') && $request->filled('companyId')) {
$companyIds = array_values(array_filter(array_map('intval', explode(',', $request->input('companyId')))));
if (! empty($companyIds)) {
$users->whereHas('companies', fn ($q) => $q->whereIn('companies.id', $companyIds));
if (Setting::getSettings()->null_company_is_floater) {
// Floater mode: users with no company associations can receive items from
// any company, so include them alongside exact-company matches.
$users->where(function ($q) use ($companyIds) {
$q->whereHas('companies', fn ($q2) => $q2->whereIn('companies.id', $companyIds))
->orWhereDoesntHave('companies');
});
} else {
$users->whereHas('companies', fn ($q) => $q->whereIn('companies.id', $companyIds));
}
}
}