wip #3753 @1

diff --git a/src/Company.php b/src/Company.php
index be7ff30652cf30a1cad2762868b185aac1f78948..3e1d98927ccbec62c3e663673c812f7db413493b 100644 (file)
--- a/src/Company.php
+++ b/src/Company.php
@@ -86,7 +86,10 @@ class Company extends CubistMagicAbstractModel
 
     public static function addOwnerClause(Builder $builder)
     {
-       $builder->whereIn( 'id', backpack_user()->getManagedCompanies());
+        if(backpack_user()->hasPermissionTo('company:admin')){
+            return;
+        }
+        $builder->whereIn('id', Permissions::getManagedCompanies(backpack_user()->id));
     }
 
 }

diff --git a/src/Permissions.php b/src/Permissions.php
index 50abc718a4f467b02c8b6e9334e0edd9cbcd66b1..37348cd7848f17ecb023c8652c19e29aa021489c 100644 (file)
--- a/src/Permissions.php
+++ b/src/Permissions.php
@@ -28,6 +28,7 @@ class Permissions
             ];
 
             foreach (User::withoutGlobalScopes()->get() as $user) {
+                /** @var $user User */
                 if (!isset($data['companyUsers'][$user->company])) {
                     $data['companyUsers'][$user->company] = [];
                 }