From 21a836ef4d3573dca6171944774b9a866efc410f Mon Sep 17 00:00:00 2001
From: mirivlad <mirivlad@lms.local>
Date: Wed, 1 Apr 2026 08:35:38 +0800
Subject: [PATCH] =?UTF-8?q?Fix:=20=D0=9E=D1=80=D0=B3=D0=B0=D0=BD=D0=B8?=
 =?UTF-8?q?=D0=B7=D0=B0=D1=86=D0=B8=D1=8F=20-=20=D0=BF=D0=BE=D0=BB=D1=8C?=
 =?UTF-8?q?=D0=B7=D0=BE=D0=B2=D0=B0=D1=82=D0=B5=D0=BB=D0=B8=20=D0=B8=20?=
 =?UTF-8?q?=D0=B3=D1=80=D1=83=D0=BF=D0=BF=D1=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

✅ Добавлен use User и use Group
✅ exclude_organization_id для поиска пользователей
✅ Исключение пользователей из текущей организации

Co-authored-by: Qwen-Coder <qwen-coder@alibabacloud.com>
---
 app/Http/Controllers/Admin/OrganizationController.php |  2 ++
 app/Http/Controllers/Api/UserSearchController.php     | 11 ++++++++++-
 resources/views/admin/organizations/show.blade.php    |  6 +++---
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/app/Http/Controllers/Admin/OrganizationController.php b/app/Http/Controllers/Admin/OrganizationController.php
index 3bf09a5..6749908 100755
--- a/app/Http/Controllers/Admin/OrganizationController.php
+++ b/app/Http/Controllers/Admin/OrganizationController.php
@@ -4,6 +4,8 @@ namespace App\Http\Controllers\Admin;
 
 use App\Http\Controllers\Controller;
 use App\Models\Organization;
+use App\Models\User;
+use App\Models\Group;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Gate;
 
diff --git a/app/Http/Controllers/Api/UserSearchController.php b/app/Http/Controllers/Api/UserSearchController.php
index 8120859..657cb05 100755
--- a/app/Http/Controllers/Api/UserSearchController.php
+++ b/app/Http/Controllers/Api/UserSearchController.php
@@ -12,9 +12,18 @@ class UserSearchController extends Controller
     {
         $query = $request->get('q', '');
         $organizationId = $request->get('organization_id', null);
+        $excludeOrganizationId = $request->get('exclude_organization_id', null);
         
         $usersQuery = User::query()->with('organization');
         
+        // Исключаем пользователей из организации (для добавления в организацию)
+        if ($excludeOrganizationId) {
+            $usersQuery->where(function($q) use ($excludeOrganizationId) {
+                $q->whereNull('organization_id')
+                  ->orWhere('organization_id', '!=', $excludeOrganizationId);
+            });
+        }
+        
         // Если указан organization_id - фильтруем
         if ($organizationId) {
             $usersQuery->where('organization_id', $organizationId);
@@ -33,7 +42,7 @@ class UserSearchController extends Controller
             ->map(function($user) {
                 return [
                     'id' => $user->id,
-                    'text' => $user->name . ($user->organization ? " ({$user->organization->name})" : ''),
+                    'text' => $user->name . ($user->organization ? " ({$user->organization->name})" : ' (Без организации)'),
                 ];
             });
         
diff --git a/resources/views/admin/organizations/show.blade.php b/resources/views/admin/organizations/show.blade.php
index 308d32d..d446920 100644
--- a/resources/views/admin/organizations/show.blade.php
+++ b/resources/views/admin/organizations/show.blade.php
@@ -134,11 +134,11 @@
                 <div class="modal-body">
                     <x-tags-input 
                         name="user_ids" 
-                        url="{{ route('api.users.search') }}" 
-                        placeholder="Начните вводить имя (пользователи без организации)..." 
+                        url="{{ route('api.users.search', ['exclude_organization_id' => $organization->id]) }}" 
+                        placeholder="Начните вводить имя (пользователи без организации или из других организаций)..." 
                         badge_color="success" 
                     />
-                    <small class="text-muted">Можно добавить пользователей без организации</small>
+                    <small class="text-muted">Можно добавить пользователей без организации или из других организаций</small>
                 </div>
                 <div class="modal-footer">
                     <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Отмена</button>