Merge pull request #7266 from abpframework/auto-merge/rel-4-2/85

Merge branch dev with rel-4.2
abpframework · Jan 15, 2021 · a9bde97 · a9bde97
2 parents da7cc17 + 0438eac
commit a9bde97
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/...tityFrameworkCore/Volo/Abp/TenantManagement/EntityFrameworkCore/EfCoreTenantRepository.cs b/...tityFrameworkCore/Volo/Abp/TenantManagement/EntityFrameworkCore/EfCoreTenantRepository.cs
@@ -25,6 +25,7 @@ public virtual async Task<Tenant> FindByNameAsync(
         {
             return await (await GetDbSetAsync())
                 .IncludeDetails(includeDetails)
+                .OrderBy(t => t.Id)
                 .FirstOrDefaultAsync(t => t.Name == name, GetCancellationToken(cancellationToken));
         }
 
@@ -33,6 +34,7 @@ public virtual Tenant FindByName(string name, bool includeDetails = true)
         {
             return DbSet
                 .IncludeDetails(includeDetails)
+                .OrderBy(t => t.Id)
                 .FirstOrDefault(t => t.Name == name);
         }
 
@@ -41,6 +43,7 @@ public virtual Tenant FindById(Guid id, bool includeDetails = true)
         {
             return DbSet
                 .IncludeDetails(includeDetails)
+                .OrderBy(t => t.Id)
                 .FirstOrDefault(t => t.Id == id);
         }