wip #6237 @0.5

diff --git a/src/app/Permissions.php b/src/app/Permissions.php
index 9b398c8c604cfd5ce6d4c813d63a92ce306a6aa5..f3fc7c0c0989b48ecc483dc441ce4e2a8b07b21f 100644 (file)
--- a/src/app/Permissions.php
+++ b/src/app/Permissions.php
@@ -4,6 +4,7 @@ namespace Cubedesigners\UserDatabase;
 
 use Cubedesigners\UserDatabase\Models\Company;
 use Cubedesigners\UserDatabase\Models\User;
+use Illuminate\Support\Facades\DB;
 
 class Permissions
 {
@@ -33,19 +34,20 @@ class Permissions
                 'companyNames' => [],
             ];
 
-            foreach (User::withoutGlobalScopes()->get() as $user) {
-                /** @var $user User */
+            $users = DB::connection('extranet_users')->select(User::withoutGlobalScopes()->toSql());
+            foreach ($users as $user) {
                 if (!isset($data['companyUsers'][$user->company])) {
                     $data['companyUsers'][$user->company] = [];
                 }
 
                 $data['companyUsers'][$user->company][] = $user->id;
                 $data['usersCompany'][$user->id] = $user->company;
-                $data['userNames'][$user->id] = $user->name;
+                $data['userNames'][$user->id] = trim($user->firstname . ' ' . $user->lastname);
                 $data['enabledUsers'][$user->id] = $user->enabled;
             }
 
-            foreach (Company::withoutGlobalScopes()->get() as $company) {
+            $companies = DB::connection('extranet_users')->select(Company::withoutGlobalScopes()->toSql());
+            foreach ($companies as $company) {
                 if (!$company->admin || !isset($data['usersCompany'][$company->admin])) {
                     continue;
                 }