diff --git a/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Repositories/RepositoryBase.cs b/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Repositories/RepositoryBase.cs index 5595a43b6e..699a42b72a 100644 --- a/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Repositories/RepositoryBase.cs +++ b/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Repositories/RepositoryBase.cs @@ -68,16 +68,16 @@ namespace Volo.Abp.Domain.Repositories { return ApplyDataFilters(query); } - - protected virtual TQueryable ApplyDataFilters(TQueryable query) - where TQueryable : IQueryable + + protected virtual TQueryable ApplyDataFilters(TQueryable query) + where TQueryable : IQueryable { - if (typeof(ISoftDelete).IsAssignableFrom(typeof(TEnt))) + if (typeof(ISoftDelete).IsAssignableFrom(typeof(TOtherEntity))) { query = (TQueryable)query.WhereIf(DataFilter.IsEnabled(), e => ((ISoftDelete)e).IsDeleted == false); } - if (typeof(IMultiTenant).IsAssignableFrom(typeof(TEnt))) + if (typeof(IMultiTenant).IsAssignableFrom(typeof(TOtherEntity))) { var tenantId = CurrentTenant.Id; query = (TQueryable)query.WhereIf(DataFilter.IsEnabled(), e => ((IMultiTenant)e).TenantId == tenantId); diff --git a/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/Blogs/MongoBlogPostRepository.cs b/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/Blogs/MongoBlogPostRepository.cs index 2d633714ce..48f23e7ebd 100644 --- a/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/Blogs/MongoBlogPostRepository.cs +++ b/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/Blogs/MongoBlogPostRepository.cs @@ -28,26 +28,24 @@ namespace Volo.CmsKit.MongoDB.Blogs Check.NotNullOrEmpty(slug, nameof(slug)); var token = GetCancellationToken(cancellationToken); - + var blogPost = await GetAsync(x => x.BlogId == blogId && x.Slug.ToLower() == slug, cancellationToken: token); - var dbContext = await GetDbContextAsync(token); - - blogPost.Author = await dbContext.Collection().AsQueryable().FirstOrDefaultAsync(x => x.Id == blogPost.AuthorId, token); + blogPost.Author = await (await GetMongoQueryableAsync(token)).FirstOrDefaultAsync(x => x.Id == blogPost.AuthorId, token); return blogPost; } public virtual async Task GetCountAsync( - string filter = null, - Guid? blogId = null, + string filter = null, + Guid? blogId = null, CancellationToken cancellationToken = default) { var token = GetCancellationToken(cancellationToken); - + return await (await GetMongoQueryableAsync(token)) .WhereIf>(!string.IsNullOrWhiteSpace(filter), x => x.Title.Contains(filter) || x.Slug.Contains(filter)) .WhereIf>(blogId.HasValue, x => x.BlogId == blogId) @@ -65,7 +63,7 @@ namespace Volo.CmsKit.MongoDB.Blogs var token = GetCancellationToken(cancellationToken); var dbContext = await GetDbContextAsync(token); var blogPostQueryable = await GetQueryableAsync(); - + var usersQueryable = dbContext.Collection().AsQueryable(); var queryable = blogPostQueryable @@ -102,4 +100,4 @@ namespace Volo.CmsKit.MongoDB.Blogs return await queryable.AnyAsync(x => x.BlogId == blogId && x.Slug.ToLower() == slug, token); } } -} \ No newline at end of file +}