From 3686035e7ab5ea467ae5398358b5e7a182c332d0 Mon Sep 17 00:00:00 2001
From: Damien <damien.burel@maarch.org>
Date: Wed, 26 Dec 2018 17:03:20 +0100
Subject: [PATCH] FIX Get Users with user without entities
---
src/app/user/controllers/UserController.php | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/src/app/user/controllers/UserController.php b/src/app/user/controllers/UserController.php
index d13875adc9e..3c02ef1b375 100755
--- a/src/app/user/controllers/UserController.php
+++ b/src/app/user/controllers/UserController.php
@@ -61,10 +61,13 @@ class UserController
]);
} else {
$entities = EntityModel::getAllEntitiesByUserId(['userId' => $GLOBALS['userId']]);
- $users = UserEntityModel::getUsersByEntities([
- 'select' => ['DISTINCT users.id', 'users.user_id', 'firstname', 'lastname', 'status', 'enabled', 'mail'],
- 'entities' => $entities
- ]);
+ $users = [];
+ if (!empty($entities)) {
+ $users = UserEntityModel::getUsersByEntities([
+ 'select' => ['DISTINCT users.id', 'users.user_id', 'firstname', 'lastname', 'status', 'enabled', 'mail'],
+ 'entities' => $entities
+ ]);
+ }
$usersNoEntities = UserEntityModel::getUsersWithoutEntities(['select' => ['id', 'users.user_id', 'firstname', 'lastname', 'status', 'enabled', 'mail']]);
$users = array_merge($users, $usersNoEntities);
}
--
GitLab