Skip to content
Snippets Groups Projects
Verified Commit dd1098a6 authored by Damien's avatar Damien
Browse files

FEAT #7387 Fix sql request

parent f61225d1
No related branches found
No related tags found
Loading
...@@ -60,13 +60,13 @@ class AutoCompleteController ...@@ -60,13 +60,13 @@ class AutoCompleteController
'select' => ['DISTINCT users.user_id', 'users.firstname', 'users.lastname'], 'select' => ['DISTINCT users.user_id', 'users.firstname', 'users.lastname'],
'entities' => $entities 'entities' => $entities
]); ]);
$usersNoEntities = UserEntityModel::getUsersWithoutEntities(['select' => ['users.id', 'user_id', 'users.firstname', 'users.lastname']]); $usersNoEntities = UserEntityModel::getUsersWithoutEntities(['select' => ['users.id', 'users.user_id', 'users.firstname', 'users.lastname']]);
$users = array_merge($users, $usersNoEntities); $users = array_merge($users, $usersNoEntities);
} else { } else {
$excludedUsers = ['superadmin']; $excludedUsers = ['superadmin'];
$users = UserModel::get([ $users = UserModel::get([
'select' => ['users.id', 'user_id', 'firstname', 'lastname'], 'select' => ['id', 'user_id', 'firstname', 'lastname'],
'where' => ['enabled = ?', 'status != ?', 'user_id not in (?)'], 'where' => ['enabled = ?', 'status != ?', 'user_id not in (?)'],
'data' => ['Y', 'DEL', $excludedUsers], 'data' => ['Y', 'DEL', $excludedUsers],
'orderBy' => ['lastname'] 'orderBy' => ['lastname']
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment