diff --git a/app/Http/Controllers/TenantController.php b/app/Http/Controllers/TenantController.php index b437a240..3c23bfdd 100644 --- a/app/Http/Controllers/TenantController.php +++ b/app/Http/Controllers/TenantController.php @@ -56,7 +56,11 @@ public function switch(Request $request) $tenantId = $request->input('tenant_id'); if ($tenantId === 'all') { - $request->session()->forget('selected_tenant_id'); + // "전체 보기" 대신 사용자의 HQ 테넌트로 설정 + $hqTenant = auth()->user()->getHQTenant(); + if ($hqTenant) { + $request->session()->put('selected_tenant_id', $hqTenant->id); + } } else { $request->session()->put('selected_tenant_id', $tenantId); } diff --git a/app/Providers/ViewServiceProvider.php b/app/Providers/ViewServiceProvider.php index 6ab63f0f..2cdd2767 100644 --- a/app/Providers/ViewServiceProvider.php +++ b/app/Providers/ViewServiceProvider.php @@ -25,6 +25,14 @@ public function boot(): void // 모든 뷰에 테넌트 목록 공유 (전역용) View::composer('*', function ($view) { if (auth()->check()) { + // 테넌트가 선택되지 않은 경우 자동으로 HQ 테넌트 설정 + if (!session('selected_tenant_id')) { + $hqTenant = auth()->user()->getHQTenant(); + if ($hqTenant) { + session(['selected_tenant_id' => $hqTenant->id]); + } + } + $globalTenants = Tenant::active() ->orderBy('company_name') ->get(['id', 'company_name', 'code']); diff --git a/resources/views/partials/header.blade.php b/resources/views/partials/header.blade.php index a17c6a8c..1eff6955 100644 --- a/resources/views/partials/header.blade.php +++ b/resources/views/partials/header.blade.php @@ -17,28 +17,17 @@ class="p-2 text-gray-600 hover:text-gray-900 hover:bg-gray-100 rounded-lg transi
{{ config('app.name') }} - @if(session('selected_tenant_id')) - @php - $mobileTenant = $globalTenants->firstWhere('id', session('selected_tenant_id')); - @endphp - @if($mobileTenant) - - @endif - @else + @php + $mobileTenant = $globalTenants->firstWhere('id', session('selected_tenant_id')); + @endphp + @if($mobileTenant) @endif
@@ -59,12 +48,6 @@ class="inline-flex items-center px-2 py-0.5 rounded text-xs font-medium bg-gray- onchange="document.getElementById('tenant-switch-form').submit()" class="border-gray-300 rounded-lg text-sm focus:ring-primary focus:border-primary min-w-[200px]" > - - @if($globalTenants->isNotEmpty()) - - @endif @foreach($globalTenants as $tenant) - @if($globalTenants->isNotEmpty()) - - @endif @foreach($globalTenants as $tenant)