From 7f19cedeee7a02f7d3bc806b950be8df4f3e6b53 Mon Sep 17 00:00:00 2001 From: mirivlad Date: Tue, 31 Mar 2026 16:46:47 +0800 Subject: [PATCH] =?UTF-8?q?Fix:=20=D0=9F=D1=80=D0=B0=D0=B2=D0=B8=D0=BB?= =?UTF-8?q?=D1=8C=D0=BD=D0=B0=D1=8F=20=D0=B3=D1=80=D1=83=D0=BF=D0=BF=D0=B8?= =?UTF-8?q?=D1=80=D0=BE=D0=B2=D0=BA=D0=B0=20where=20=D0=B2=20UserSearchCon?= =?UTF-8?q?troller?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ✅ where(function() {...}) для группировки условий ✅ organization_id фильтруется корректно Co-authored-by: Qwen-Coder --- app/Http/Controllers/Api/UserSearchController.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/Api/UserSearchController.php b/app/Http/Controllers/Api/UserSearchController.php index a3a568c..8120859 100755 --- a/app/Http/Controllers/Api/UserSearchController.php +++ b/app/Http/Controllers/Api/UserSearchController.php @@ -20,9 +20,13 @@ class UserSearchController extends Controller $usersQuery->where('organization_id', $organizationId); } + // Фильтр по имени И email (правильная группировка) + $usersQuery->where(function($q) use ($query) { + $q->where('name', 'like', "%{$query}%") + ->orWhere('email', 'like', "%{$query}%"); + }); + $users = $usersQuery - ->where('name', 'like', "%{$query}%") - ->orWhere('email', 'like', "%{$query}%") ->orderBy('name') ->limit(50) ->get()