Fix for users

davidjumani · davidjumani · commit 0678a0102fc0 · 2022-02-28T15:52:19.000+05:30
diff --git a/server/src/main/java/com/cloud/api/query/QueryManagerImpl.java b/server/src/main/java/com/cloud/api/query/QueryManagerImpl.java
@@ -602,7 +602,7 @@ private Pair<List<UserAccountJoinVO>, Integer> getUserListInternal(Account calle
         sb.and("accountName", sb.entity().getAccountName(), Op.EQ);
         sb.and("state", sb.entity().getState(), Op.EQ);
 
-        if ((accountName == null) && (domainId != null)) {
+        if ((accountName == null) && (domainId != null) && isRecursive) {
             sb.and("domainPath", sb.entity().getDomainPath(), Op.LIKE);
         }
 

Original file line number	Diff line number	Diff line change
`@@ -602,7 +602,7 @@ private Pair<List<UserAccountJoinVO>, Integer> getUserListInternal(Account calle`
`602`	`602`	`sb.and("accountName", sb.entity().getAccountName(), Op.EQ);`
`603`	`603`	`sb.and("state", sb.entity().getState(), Op.EQ);`
`604`	`604`
`605`		`- if ((accountName == null) && (domainId != null)) {`
	`605`	`+ if ((accountName == null) && (domainId != null) && isRecursive) {`
`606`	`606`	`sb.and("domainPath", sb.entity().getDomainPath(), Op.LIKE);`
`607`	`607`	`}`
`608`	`608`