diff --git a/app/Services/SidebarMenuService.php b/app/Services/SidebarMenuService.php index d9eed89b..6a53bfda 100644 --- a/app/Services/SidebarMenuService.php +++ b/app/Services/SidebarMenuService.php @@ -16,7 +16,8 @@ class SidebarMenuService public function getUserMenuTree(?User $user = null): Collection { $user = $user ?? auth()->user(); - $tenantId = session('selected_tenant_id', 1); + // 로그인한 사용자의 tenant_id만 사용 (session 값 무시) + $tenantId = $user?->tenant_id ?? 1; // 테넌트의 모든 활성 메뉴 조회 $allMenus = Menu::withoutGlobalScopes() diff --git a/resources/views/components/sidebar/menu-group.blade.php b/resources/views/components/sidebar/menu-group.blade.php index a21c7d00..cc5b5745 100644 --- a/resources/views/components/sidebar/menu-group.blade.php +++ b/resources/views/components/sidebar/menu-group.blade.php @@ -5,13 +5,14 @@ $isExpanded = $sidebarMenuService->isMenuOrChildActive($menu); $groupId = 'menu-group-' . $menu->id; $children = $menu->menuChildren ?? collect(); + $hasChildren = $children->isNotEmpty(); $paddingLeft = $depth > 0 ? ($depth * 0.75 + 0.75) . 'rem' : '0.75rem'; @endphp
  • {{-- 그룹 헤더 (접기/펼치기 버튼) --}}