From c1d23fb7547b9bd5943e2e39416b9a5a4c9e9b91 Mon Sep 17 00:00:00 2001
From: Mansur Besleney <84874279+MansurBesleney@users.noreply.github.com>
Date: Fri, 24 Jan 2025 11:44:58 +0300
Subject: [PATCH] Update MongoIdentityUserRepository.cs

---
 .../Identity/MongoDB/MongoIdentityUserRepository.cs  | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/modules/identity/src/Volo.Abp.Identity.MongoDB/Volo/Abp/Identity/MongoDB/MongoIdentityUserRepository.cs b/modules/identity/src/Volo.Abp.Identity.MongoDB/Volo/Abp/Identity/MongoDB/MongoIdentityUserRepository.cs
index e580bd846d..64c47f8d2c 100644
--- a/modules/identity/src/Volo.Abp.Identity.MongoDB/Volo/Abp/Identity/MongoDB/MongoIdentityUserRepository.cs
+++ b/modules/identity/src/Volo.Abp.Identity.MongoDB/Volo/Abp/Identity/MongoDB/MongoIdentityUserRepository.cs
@@ -449,6 +449,11 @@ public class MongoIdentityUserRepository : MongoDbRepository<IAbpIdentityMongoDb
         var upperFilter = filter?.ToUpperInvariant();
         var query = await GetQueryableAsync(cancellationToken);
 
+        if (id.HasValue)
+        {
+            return query.Where(x => x.Id == id);
+        }
+        
         if (roleId.HasValue)
         {
             var organizationUnitIds = (await GetQueryableAsync<OrganizationUnit>(cancellationToken))
@@ -459,11 +464,6 @@ public class MongoIdentityUserRepository : MongoDbRepository<IAbpIdentityMongoDb
             query = query.Where(identityUser => identityUser.Roles.Any(x => x.RoleId == roleId.Value) || identityUser.OrganizationUnits.Any(x => organizationUnitIds.Contains(x.OrganizationUnitId)));
         }
 
-        if (id.HasValue)
-        {
-            return query.Where(x => x.Id == id);
-        }
-
         return  query
             .WhereIf(
                 !filter.IsNullOrWhiteSpace(),
@@ -490,4 +490,4 @@ public class MongoIdentityUserRepository : MongoDbRepository<IAbpIdentityMongoDb
             .WhereIf(maxModifitionTime != null, p => p.LastModificationTime <= maxModifitionTime)
             .WhereIf(minModifitionTime != null, p => p.LastModificationTime >= minModifitionTime);
     }
-}
\ No newline at end of file
+}