Skip to content

A free open source IT asset/license management system

FMCS: Users API - Check for floater in results

snipe53628d6ae398
diff --git a/app/Http/Controllers/Api/UsersController.php b/app/Http/Controllers/Api/UsersController.php
index 5512247dbb..6fb22ef6ea 100644
--- a/app/Http/Controllers/Api/UsersController.php
+++ b/app/Http/Controllers/Api/UsersController.php
@@ -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));
+ }
}
}