修改分页列表bug
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/push Build is passing
Details
parent
3096671595
commit
8e8b55fa46
|
@ -37,8 +37,8 @@ namespace IRaCIS.Core.Application.Service
|
|||
|
||||
.WhereIf(queryCommonDocument.CriterionTypeEnum != null, t => t.CriterionTypeEnum == queryCommonDocument.CriterionTypeEnum)
|
||||
.WhereIf(queryCommonDocument.BusinessScenarioEnum != null, t => t.BusinessScenarioEnum == queryCommonDocument.BusinessScenarioEnum)
|
||||
.WhereIf(string.IsNullOrEmpty(queryCommonDocument.Code), t => t.Code.Contains(queryCommonDocument.Code))
|
||||
.WhereIf(string.IsNullOrEmpty(queryCommonDocument.Name), t => t.Name.Contains(queryCommonDocument.Name))
|
||||
.WhereIf(!string.IsNullOrEmpty(queryCommonDocument.Code), t => t.Code.Contains(queryCommonDocument.Code))
|
||||
.WhereIf(!string.IsNullOrEmpty(queryCommonDocument.Name), t => t.Name.Contains(queryCommonDocument.Name))
|
||||
.ProjectTo<CommonDocumentView>(_mapper.ConfigurationProvider, new { token = _userInfo.UserToken, userId = _userInfo.Id });
|
||||
|
||||
return await commonDocumentQueryable.ToPagedListAsync(queryCommonDocument);
|
||||
|
|
|
@ -16,9 +16,9 @@ namespace IRaCIS.Core.Infrastructure.Extention
|
|||
//单字段排序 异步 (或者默认排序字段是空,多字段排序,传递了,就以传递的单字段为准)
|
||||
public static async Task<PageOutput<T>> ToPagedListAsync<T>(this IQueryable<T> source, PageInput pageInput, string[] sortArray = default, CancellationToken cancellationToken = default)
|
||||
{
|
||||
var isMultiSortFiled = true;
|
||||
var isMultiSortFiled = false;
|
||||
|
||||
if (string.IsNullOrWhiteSpace(pageInput.SortField) && sortArray != default)
|
||||
if (string.IsNullOrWhiteSpace(pageInput.SortField) && sortArray != default && sortArray != null)
|
||||
{
|
||||
isMultiSortFiled = true;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue