Merge pull request #13557 from abpframework/Commercial-demo-searching-11148

Commercial demo searching 11148

modules/identity/src/Volo.Abp.Identity.EntityFrameworkCore/Volo/Abp/Identity/EntityFrameworkCore/EfCoreIdentityUserRepository.cs

@@ -161,7 +161,7 @@ public class EfCoreIdentityUserRepository : EfCoreRepository<IIdentityDbContext,
             .WhereIf(!string.IsNullOrWhiteSpace(userName), x => x.UserName == userName)
             .WhereIf(!string.IsNullOrWhiteSpace(phoneNumber), x => x.PhoneNumber == phoneNumber)
             .WhereIf(!string.IsNullOrWhiteSpace(emailAddress), x => x.Email == emailAddress)
-            .WhereIf(isLockedOut == true, x => x.LockoutEnabled && x.LockoutEnd > DateTimeOffset.UtcNow)
+            .WhereIf(isLockedOut == true, x => x.LockoutEnabled && x.LockoutEnd.Value.CompareTo(DateTime.UtcNow) > 0)
             .WhereIf(notActive == true, x => !x.IsActive)
             .OrderBy(sorting.IsNullOrWhiteSpace() ? nameof(IdentityUser.UserName) : sorting)
             .PageBy(skipCount, maxResultCount)
@@ -225,7 +225,7 @@ public class EfCoreIdentityUserRepository : EfCoreRepository<IIdentityDbContext,
             .WhereIf(!string.IsNullOrWhiteSpace(userName), x => x.UserName == userName)
             .WhereIf(!string.IsNullOrWhiteSpace(phoneNumber), x => x.PhoneNumber == phoneNumber)
             .WhereIf(!string.IsNullOrWhiteSpace(emailAddress), x => x.Email == emailAddress)
-            .WhereIf(isLockedOut == true, x => x.LockoutEnabled && x.LockoutEnd > DateTimeOffset.UtcNow)
+            .WhereIf(isLockedOut == true, x => x.LockoutEnabled && x.LockoutEnd.Value.CompareTo(DateTime.UtcNow) > 0)
             .WhereIf(notActive == true, x => !x.IsActive)
             .LongCountAsync(GetCancellationToken(cancellationToken));
     }

modules/identity/test/Volo.Abp.Identity.TestBase/Volo/Abp/Identity/AbpIdentityTestDataBuilder.cs

@@ -117,6 +117,8 @@ public class AbpIdentityTestDataBuilder : ITransientDependency
         await _userRepository.InsertAsync(adminUser);
 
         var john = new IdentityUser(_testData.UserJohnId, "john.nash", "john.nash@abp.io");
+        john.LockoutEnabled = true;
+        john.LockoutEnd = DateTime.UtcNow.AddDays(1);
         john.AddRole(_moderatorRole.Id);
         john.AddRole(_supporterRole.Id);
         john.AddOrganizationUnit(_ou111.Id);
@@ -132,6 +134,8 @@ public class AbpIdentityTestDataBuilder : ITransientDependency
         await _userRepository.InsertAsync(david);
 
         var neo = new IdentityUser(_testData.UserNeoId, "neo", "neo@abp.io");
+        neo.LockoutEnabled = true;
+        neo.LockoutEnd = DateTime.UtcNow.AddDays(1);
         neo.AddRole(_supporterRole.Id);
         neo.AddClaim(_guidGenerator, new Claim("TestClaimType", "43"));
         neo.AddOrganizationUnit(_ou111.Id);

modules/identity/test/Volo.Abp.Identity.TestBase/Volo/Abp/Identity/IdentityUserRepository_Tests.cs

@@ -92,7 +92,7 @@ public abstract class IdentityUserRepository_Tests<TStartupModule> : AbpIdentity
     [Fact]
     public async Task GetListAsync()
     {
-        var users = await UserRepository.GetListAsync("UserName DESC", 5, 0, "n");
+        var users = await UserRepository.GetListAsync("UserName DESC", 5, 0, "n", isLockedOut: true);
 
         users.Count.ShouldBeGreaterThan(1);
         users.Count.ShouldBeLessThanOrEqualTo(5);