revert change from other PR

Author: DaanHoogland

server/src/main/java/com/cloud/user/AccountManagerImpl.java

@@ -2955,17 +2955,18 @@ public void buildACLSearchParameters(Account caller, Long id, String accountName
         if (projectId != null) {
             if (!forProjectInvitation) {
                 if (projectId == -1L) {
-                    domainIdRecursiveListProject.third(Project.ListProjectResourcesCriteria.ListProjectResourcesOnly);
-                    if (caller.getType() != Account.Type.ADMIN) {
+                    if (caller.getType() == Account.Type.ADMIN) {
+                        domainIdRecursiveListProject.third(Project.ListProjectResourcesCriteria.ListProjectResourcesOnly);
+                        if (listAll) {
+                            domainIdRecursiveListProject.third(ListProjectResourcesCriteria.ListAllIncludingProjectResources);
+                        }
+                    } else {
                         permittedAccounts.addAll(_projectMgr.listPermittedProjectAccounts(caller.getId()));
                         // permittedAccounts can be empty when the caller is not a part of any project (a domain account)
                         if (permittedAccounts.isEmpty()) {
                             permittedAccounts.add(caller.getId());
                         }
                     }
-                    if (listAll) {
-                        domainIdRecursiveListProject.third(ListProjectResourcesCriteria.ListAllIncludingProjectResources);
-                    }
                 } else {
                     Project project = _projectMgr.getProject(projectId);
                     if (project == null) {