diff --git a/Api/Ewide.Core/Service/Area/AreaCodeService.cs b/Api/Ewide.Core/Service/Area/AreaCodeService.cs index 2e48274..43a7e52 100644 --- a/Api/Ewide.Core/Service/Area/AreaCodeService.cs +++ b/Api/Ewide.Core/Service/Area/AreaCodeService.cs @@ -1,4 +1,5 @@ -using Ewide.Core.Service.Area.Dto; +using Ewide.Core.Extension; +using Ewide.Core.Service.Area.Dto; using Furion.DatabaseAccessor; using Furion.DatabaseAccessor.Extensions; using Furion.DependencyInjection; @@ -94,11 +95,11 @@ namespace Ewide.Core.Service.Area public async Task QueryAreaCodePageList(AreaCodeInput input) { var AreaCodes = await _areaCodeRep.DetachedEntities - .Where(input.LevelType.HasValue ,a=>a.LevelType == input.LevelType) - .Where(!string.IsNullOrEmpty(input.Code),a=>a.Code.StartsWith(input.Code)) - .Where(!string.IsNullOrEmpty(input.ShowCode),a =>a.ShowCode.StartsWith(input.ShowCode)) - .Where(!string.IsNullOrEmpty(input.Name),a =>a.Name.StartsWith(input.Name)) - .Select(p => p.Adapt()).ToPagedListAsync(input.PageNo, input.PageSize); + .Where(input.LevelType.HasValue, a => a.LevelType == input.LevelType) + .Where(!string.IsNullOrEmpty(input.Code), a => a.Code.StartsWith(input.Code)) + .Where(!string.IsNullOrEmpty(input.ShowCode), a => a.ShowCode.StartsWith(input.ShowCode)) + .Where(!string.IsNullOrEmpty(input.Name), a => a.Name.StartsWith(input.Name)) + .ToPageData(input); return XnPageResult.PageResult(AreaCodes); }