From 7e70955b26d9cd4c59cae59fe91bc56c490e2f71 Mon Sep 17 00:00:00 2001
From: Geriano <gerznewbie@gmail.com>
Date: Sat, 30 Jul 2022 12:18:04 +0700
Subject: [PATCH] fix bug menu still show when user not have permission

---
 app/Models/User.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/app/Models/User.php b/app/Models/User.php
index c4778ce..6effbde 100644
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -73,9 +73,7 @@ class User extends Authenticatable
         return Menu::whereNull('parent_id')
                     ->where(function (Builder $query) {
                         $query->whereHas('permissions', function (Builder $query) {
-                            $query->whereIn('permissions.id', $this->permissions->pluck('id'));
-
-                            $this->roles->each(fn (Role $role) => $query->orWhereIn('permissions.id', $role->permissions->pluck('id')));
+                            $query->whereIn('permissions.id', $this->permissions->pluck('id')->push(...$this->roles->pluck('permissions')->flatten()->pluck('id')));
                         })->orDoesntHave('permissions');
                     })
                     ->orderBy('position')