diff --git a/src/Controller/UserController.php b/src/Controller/UserController.php index 7ce7d66..f69cbb4 100644 --- a/src/Controller/UserController.php +++ b/src/Controller/UserController.php @@ -43,7 +43,7 @@ class UserController extends AbstractController if ($this->isGranted('ROLE_SUPER_ADMIN')) { $uo = $this->entityManager->getRepository(UsersOrganizations::class)->findUsersWithOrganization(); $noOrgUsers = $this->userService->formatNoOrgUsersAsAssoc( - $this->entityManager->getRepository(User::class)->findActiveUsersWithoutOrganization()); + $this->entityManager->getRepository(User::class)->findUsersWithoutOrganization()); $usersByOrganization = $this->userService->groupByOrganization($uo); $usersByOrganization += $noOrgUsers; diff --git a/src/Repository/UserRepository.php b/src/Repository/UserRepository.php index 252317b..0af98d0 100644 --- a/src/Repository/UserRepository.php +++ b/src/Repository/UserRepository.php @@ -40,16 +40,14 @@ class UserRepository extends ServiceEntityRepository implements PasswordUpgrader * * @return User[] */ - public function findActiveUsersWithoutOrganization(): array + public function findUsersWithoutOrganization(): array { $qb = $this->createQueryBuilder('u') ->select('u') ->leftJoin(UsersOrganizations::class, 'uo', 'WITH', 'uo.users = u') - ->where('u.isActive = :uActive') ->andWhere('u.isDeleted = :uDeleted') ->andWhere('uo.id IS NULL') ->orderBy('u.surname', 'ASC') - ->setParameter('uActive', true) ->setParameter('uDeleted', false); return $qb->getQuery()->getResult();