diff --git a/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/Pages/EfCorePageRepository.cs b/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/Pages/EfCorePageRepository.cs index 794281fa01..2fc6d92c52 100644 --- a/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/Pages/EfCorePageRepository.cs +++ b/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/Pages/EfCorePageRepository.cs @@ -17,23 +17,23 @@ namespace Volo.CmsKit.Pages { } - public virtual Task GetCountAsync(string filter = null, CancellationToken cancellationToken = default) + public virtual async Task GetCountAsync(string filter = null, CancellationToken cancellationToken = default) { - return (await GetDbSetAsync()).WhereIf( + return await (await GetDbSetAsync()).WhereIf( !filter.IsNullOrWhiteSpace(), x => x.Title.Contains(filter) ).CountAsync(GetCancellationToken(cancellationToken)); } - public virtual Task> GetListAsync( + public virtual async Task> GetListAsync( string filter = null, int maxResultCount = int.MaxValue, int skipCount = 0, string sorting = null, CancellationToken cancellationToken = default) { - return (await GetDbSetAsync()).WhereIf( + return await (await GetDbSetAsync()).WhereIf( !filter.IsNullOrWhiteSpace(), x => x.Title.Contains(filter)) @@ -52,9 +52,9 @@ namespace Volo.CmsKit.Pages return FindAsync(x => x.Url == url, cancellationToken: GetCancellationToken(cancellationToken)); } - public virtual Task ExistsAsync(string url, CancellationToken cancellationToken = default) + public virtual async Task ExistsAsync(string url, CancellationToken cancellationToken = default) { - return (await GetDbSetAsync()).AnyAsync(x => x.Url == url, GetCancellationToken(cancellationToken)); + return await (await GetDbSetAsync()).AnyAsync(x => x.Url == url, GetCancellationToken(cancellationToken)); } } } diff --git a/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/Pages/MongoPageRepository.cs b/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/Pages/MongoPageRepository.cs index 00700bd091..1aecf4bf97 100644 --- a/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/Pages/MongoPageRepository.cs +++ b/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/Pages/MongoPageRepository.cs @@ -18,9 +18,9 @@ namespace Volo.CmsKit.MongoDB.Pages { } - public virtual Task GetCountAsync(string filter = null, CancellationToken cancellationToken = default) + public virtual async Task GetCountAsync(string filter = null, CancellationToken cancellationToken = default) { - return (await GetMongoQueryableAsync()) + return await (await GetMongoQueryableAsync(GetCancellationToken(cancellationToken))) .WhereIf>( !filter.IsNullOrWhiteSpace(), u => @@ -28,14 +28,14 @@ namespace Volo.CmsKit.MongoDB.Pages ).CountAsync(GetCancellationToken(cancellationToken)); } - public virtual Task> GetListAsync( + public virtual async Task> GetListAsync( string filter = null, int maxResultCount = int.MaxValue, int skipCount = 0, string sorting = null, CancellationToken cancellationToken = default) { - return (await GetMongoQueryableAsync()) + return await (await GetMongoQueryableAsync(GetCancellationToken(cancellationToken))) .WhereIf>( !filter.IsNullOrWhiteSpace(), u => @@ -57,9 +57,9 @@ namespace Volo.CmsKit.MongoDB.Pages return FindAsync(x => x.Url == url, cancellationToken: GetCancellationToken(cancellationToken)); } - public virtual Task ExistsAsync(string url, CancellationToken cancellationToken = default) + public virtual async Task ExistsAsync(string url, CancellationToken cancellationToken = default) { - return (await GetMongoQueryableAsync()).AnyAsync(x => x.Url == url, GetCancellationToken(cancellationToken)); + return await (await GetMongoQueryableAsync(GetCancellationToken(cancellationToken))).AnyAsync(x => x.Url == url, GetCancellationToken(cancellationToken)); } } }