Browse Source

fix(saas): use inline to query the relationship between the tenant and edition

pull/518/head
cKey 4 years ago
parent
commit
6fef6967e7
  1. 24
      aspnet-core/modules/saas/LINGYUN.Abp.Saas.EntityFrameworkCore/LINGYUN/Abp/Saas/EntityFrameworkCore/EfCoreTenantRepository.cs

24
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 editionDbSet = dbContext.Set<Edition>();
var queryable = from tenant in tenantDbSet var queryable = from tenant in tenantDbSet
join edition in editionDbSet join edition in editionDbSet on tenant.EditionId equals edition.Id into eg
on tenant.EditionId equals edition.Id from e in eg.DefaultIfEmpty()
where tenant.Id.Equals(id) where tenant.Id.Equals(id)
orderby tenant.Id orderby tenant.Id
select new select new
{ {
Tenant = tenant, Tenant = tenant,
Edition = edition, Edition = e,
}; };
var result = await queryable var result = await queryable
.FirstOrDefaultAsync(GetCancellationToken(cancellationToken)); .FirstOrDefaultAsync(GetCancellationToken(cancellationToken));
@ -68,14 +68,14 @@ public class EfCoreTenantRepository : EfCoreRepository<ISaasDbContext, Tenant, G
{ {
var editionDbSet = dbContext.Set<Edition>(); var editionDbSet = dbContext.Set<Edition>();
var queryable = from tenant in tenantDbSet var queryable = from tenant in tenantDbSet
join edition in editionDbSet join edition in editionDbSet on tenant.EditionId equals edition.Id into eg
on tenant.EditionId equals edition.Id from e in eg.DefaultIfEmpty()
where tenant.Name.Equals(name) where tenant.Name.Equals(name)
orderby tenant.Id orderby tenant.Id
select new select new
{ {
Tenant = tenant, Tenant = tenant,
Edition = edition, Edition = e,
}; };
var result = await queryable var result = await queryable
.FirstOrDefaultAsync(GetCancellationToken(cancellationToken)); .FirstOrDefaultAsync(GetCancellationToken(cancellationToken));
@ -102,14 +102,14 @@ public class EfCoreTenantRepository : EfCoreRepository<ISaasDbContext, Tenant, G
{ {
var editionDbSet = DbContext.Set<Edition>(); var editionDbSet = DbContext.Set<Edition>();
var queryable = from tenant in tenantDbSet var queryable = from tenant in tenantDbSet
join edition in editionDbSet join edition in editionDbSet on tenant.EditionId equals edition.Id into eg
on tenant.EditionId equals edition.Id from e in eg.DefaultIfEmpty()
where tenant.Name.Equals(name) where tenant.Name.Equals(name)
orderby tenant.Id orderby tenant.Id
select new select new
{ {
Tenant = tenant, Tenant = tenant,
Edition = edition, Edition = e,
}; };
var result = queryable var result = queryable
.FirstOrDefault(); .FirstOrDefault();
@ -136,14 +136,14 @@ public class EfCoreTenantRepository : EfCoreRepository<ISaasDbContext, Tenant, G
{ {
var editionDbSet = DbContext.Set<Edition>(); var editionDbSet = DbContext.Set<Edition>();
var queryable = from tenant in tenantDbSet var queryable = from tenant in tenantDbSet
join edition in editionDbSet join edition in editionDbSet on tenant.EditionId equals edition.Id into eg
on tenant.EditionId equals edition.Id from e in eg.DefaultIfEmpty()
where tenant.Id.Equals(id) where tenant.Id.Equals(id)
orderby tenant.Id orderby tenant.Id
select new select new
{ {
Tenant = tenant, Tenant = tenant,
Edition = edition, Edition = e,
}; };
var result = queryable var result = queryable
.FirstOrDefault(); .FirstOrDefault();

Loading…
Cancel
Save