diff --git a/resources/views/partials/header.blade.php b/resources/views/partials/header.blade.php index 5d03b0c2..b8825368 100644 --- a/resources/views/partials/header.blade.php +++ b/resources/views/partials/header.blade.php @@ -37,7 +37,11 @@ class="border-gray-300 rounded-lg text-sm focus:ring-primary focus:border-primar $currentTenant = $globalTenants->firstWhere('id', session('selected_tenant_id')); @endphp @if($currentTenant) - + diff --git a/resources/views/permissions/partials/table.blade.php b/resources/views/permissions/partials/table.blade.php index 057ba623..c3d5e26c 100644 --- a/resources/views/permissions/partials/table.blade.php +++ b/resources/views/permissions/partials/table.blade.php @@ -126,7 +126,15 @@ function getPermissionConfig(string $type): array {!! formatPermissionName($permission->name) !!} - {{ $permission->tenant?->company_name ?? '전역' }} + @if($permission->tenant) + {{ $permission->tenant->company_name }} + @else + 전역 + @endif diff --git a/resources/views/roles/partials/table.blade.php b/resources/views/roles/partials/table.blade.php index 887850e7..372f5abe 100644 --- a/resources/views/roles/partials/table.blade.php +++ b/resources/views/roles/partials/table.blade.php @@ -27,9 +27,17 @@ @if($isAllTenants) - - {{ $role->tenant?->company_name ?? '미지정' }} - + @if($role->tenant) + + {{ $role->tenant->company_name }} + + @else + 미지정 + @endif @endif