Merge pull request #68 from jeremykenedy/jeremykenedy-patch-1

Update HasRoleAndPermission.php
jeremykenedy · Jul 31, 2019 · 5855193 · 5855193
2 parents 1a7e464 + bbe7114
commit 5855193
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/Traits/HasRoleAndPermission.php b/src/Traits/HasRoleAndPermission.php
@@ -204,7 +204,7 @@ public function rolePermissions()
             ->join('roles', 'roles.id', '=', 'permission_role.role_id')
             ->whereIn('roles.id', $this->getRoles()->pluck('id')->toArray())
             ->orWhere('roles.level', '<', $this->level())
-            ->groupBy(['permissions.id', 'permissions.name', 'permissions.slug', 'permissions.description', 'permissions.model', 'permissions.created_at', 'permissions.updated_at', 'pivot_created_at', 'pivot_updated_at']);
+            ->groupBy(['permissions.id', 'permissions.name', 'permissions.slug', 'permissions.description', 'permissions.model', 'permissions.created_at', 'permissions.updated_at', 'permissions.deleted_at', 'pivot_created_at', 'pivot_updated_at']);
     }
 
     /**