display inactive users
This commit is contained in:
parent
245f044a40
commit
1e33782f75
|
|
@ -43,7 +43,7 @@ class UserController extends AbstractController
|
||||||
if ($this->isGranted('ROLE_SUPER_ADMIN')) {
|
if ($this->isGranted('ROLE_SUPER_ADMIN')) {
|
||||||
$uo = $this->entityManager->getRepository(UsersOrganizations::class)->findUsersWithOrganization();
|
$uo = $this->entityManager->getRepository(UsersOrganizations::class)->findUsersWithOrganization();
|
||||||
$noOrgUsers = $this->userService->formatNoOrgUsersAsAssoc(
|
$noOrgUsers = $this->userService->formatNoOrgUsersAsAssoc(
|
||||||
$this->entityManager->getRepository(User::class)->findActiveUsersWithoutOrganization());
|
$this->entityManager->getRepository(User::class)->findUsersWithoutOrganization());
|
||||||
$usersByOrganization = $this->userService->groupByOrganization($uo);
|
$usersByOrganization = $this->userService->groupByOrganization($uo);
|
||||||
$usersByOrganization += $noOrgUsers;
|
$usersByOrganization += $noOrgUsers;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -40,16 +40,14 @@ class UserRepository extends ServiceEntityRepository implements PasswordUpgrader
|
||||||
*
|
*
|
||||||
* @return User[]
|
* @return User[]
|
||||||
*/
|
*/
|
||||||
public function findActiveUsersWithoutOrganization(): array
|
public function findUsersWithoutOrganization(): array
|
||||||
{
|
{
|
||||||
$qb = $this->createQueryBuilder('u')
|
$qb = $this->createQueryBuilder('u')
|
||||||
->select('u')
|
->select('u')
|
||||||
->leftJoin(UsersOrganizations::class, 'uo', 'WITH', 'uo.users = u')
|
->leftJoin(UsersOrganizations::class, 'uo', 'WITH', 'uo.users = u')
|
||||||
->where('u.isActive = :uActive')
|
|
||||||
->andWhere('u.isDeleted = :uDeleted')
|
->andWhere('u.isDeleted = :uDeleted')
|
||||||
->andWhere('uo.id IS NULL')
|
->andWhere('uo.id IS NULL')
|
||||||
->orderBy('u.surname', 'ASC')
|
->orderBy('u.surname', 'ASC')
|
||||||
->setParameter('uActive', true)
|
|
||||||
->setParameter('uDeleted', false);
|
->setParameter('uDeleted', false);
|
||||||
|
|
||||||
return $qb->getQuery()->getResult();
|
return $qb->getQuery()->getResult();
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue