From 6fef6967e78812fcc434ffbdfa2a3f974ad70f47 Mon Sep 17 00:00:00 2001
From: cKey <35512826+colinin@users.noreply.github.com>
Date: Thu, 17 Mar 2022 20:56:43 +0800
Subject: [PATCH] fix(saas): use inline to query the relationship between the
 tenant and edition

---
 .../EfCoreTenantRepository.cs                 | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/aspnet-core/modules/saas/LINGYUN.Abp.Saas.EntityFrameworkCore/LINGYUN/Abp/Saas/EntityFrameworkCore/EfCoreTenantRepository.cs b/aspnet-core/modules/saas/LINGYUN.Abp.Saas.EntityFrameworkCore/LINGYUN/Abp/Saas/EntityFrameworkCore/EfCoreTenantRepository.cs
index 05691e45d..5313eecac 100644
--- a/aspnet-core/modules/saas/LINGYUN.Abp.Saas.EntityFrameworkCore/LINGYUN/Abp/Saas/EntityFrameworkCore/EfCoreTenantRepository.cs
+++ b/aspnet-core/modules/saas/LINGYUN.Abp.Saas.EntityFrameworkCore/LINGYUN/Abp/Saas/EntityFrameworkCore/EfCoreTenantRepository.cs
@@ -30,14 +30,14 @@ public class EfCoreTenantRepository : EfCoreRepository<ISaasDbContext, Tenant, G
         {
             var editionDbSet = dbContext.Set<Edition>();
             var queryable = from tenant in tenantDbSet
-                            join edition in editionDbSet
-                                on tenant.EditionId equals edition.Id
+                            join edition in editionDbSet on tenant.EditionId equals edition.Id into eg
+                            from e in eg.DefaultIfEmpty()
                             where tenant.Id.Equals(id)
                             orderby tenant.Id
                             select new
                             {
                                 Tenant = tenant,
-                                Edition = edition,
+                                Edition = e,
                             };
             var result = await queryable
                 .FirstOrDefaultAsync(GetCancellationToken(cancellationToken));
@@ -68,14 +68,14 @@ public class EfCoreTenantRepository : EfCoreRepository<ISaasDbContext, Tenant, G
         {
             var editionDbSet = dbContext.Set<Edition>();
             var queryable = from tenant in tenantDbSet
-                    join edition in editionDbSet
-                        on tenant.EditionId equals edition.Id
+                    join edition in editionDbSet on tenant.EditionId equals edition.Id into eg
+                    from e in eg.DefaultIfEmpty()
                     where tenant.Name.Equals(name)
                     orderby tenant.Id
                     select new
                     {
                         Tenant = tenant,
-                        Edition = edition,
+                        Edition = e,
                     };
             var result = await queryable
                 .FirstOrDefaultAsync(GetCancellationToken(cancellationToken));
@@ -102,14 +102,14 @@ public class EfCoreTenantRepository : EfCoreRepository<ISaasDbContext, Tenant, G
         {
             var editionDbSet = DbContext.Set<Edition>();
             var queryable = from tenant in tenantDbSet
-                            join edition in editionDbSet
-                                on tenant.EditionId equals edition.Id
+                            join edition in editionDbSet on tenant.EditionId equals edition.Id into eg
+                            from e in eg.DefaultIfEmpty()
                             where tenant.Name.Equals(name)
                             orderby tenant.Id
                             select new
                             {
                                 Tenant = tenant,
-                                Edition = edition,
+                                Edition = e,
                             };
             var result = queryable
                 .FirstOrDefault();
@@ -136,14 +136,14 @@ public class EfCoreTenantRepository : EfCoreRepository<ISaasDbContext, Tenant, G
         {
             var editionDbSet = DbContext.Set<Edition>();
             var queryable = from tenant in tenantDbSet
-                            join edition in editionDbSet
-                                on tenant.EditionId equals edition.Id
+                            join edition in editionDbSet on tenant.EditionId equals edition.Id into eg
+                            from e in eg.DefaultIfEmpty()
                             where tenant.Id.Equals(id)
                             orderby tenant.Id
                             select new
                             {
                                 Tenant = tenant,
-                                Edition = edition,
+                                Edition = e,
                             };
             var result = queryable
                 .FirstOrDefault();