From 2706fc3ef2b534608614dd8db5c7737e458714cc Mon Sep 17 00:00:00 2001 From: cKey <35512826+colinin@users.noreply.github.com> Date: Sun, 5 Feb 2023 15:31:53 +0800 Subject: [PATCH] =?UTF-8?q?fix(dynamic-quertable):=20=E5=BD=93=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E6=96=B9=E6=B3=95=E4=B8=8E=E5=8A=A8=E6=80=81=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E9=87=8D=E5=90=8D=E6=97=B6,=20=E8=87=AA=E5=8A=A8api?= =?UTF-8?q?=E7=AB=AF=E7=82=B9=E4=B8=8D=E4=BC=9A=E5=88=9B=E5=BB=BA=E5=A4=9A?= =?UTF-8?q?=E4=B8=AA=E7=AB=AF=E7=82=B9.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Abp/Dynamic/Queryable/IDynamicQueryableAppService.cs | 4 ++-- .../Abp/Dynamic/Queryable/DynamicQueryableAppService.cs | 8 ++++---- .../Dynamic/Queryable/DynamicQueryableControllerBase.cs | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/aspnet-core/modules/dynamic-queryable/LINGYUN.Abp.Dynamic.Queryable.Application.Contracts/LINGYUN/Abp/Dynamic/Queryable/IDynamicQueryableAppService.cs b/aspnet-core/modules/dynamic-queryable/LINGYUN.Abp.Dynamic.Queryable.Application.Contracts/LINGYUN/Abp/Dynamic/Queryable/IDynamicQueryableAppService.cs index 5e75f1617..d1a7a7341 100644 --- a/aspnet-core/modules/dynamic-queryable/LINGYUN.Abp.Dynamic.Queryable.Application.Contracts/LINGYUN/Abp/Dynamic/Queryable/IDynamicQueryableAppService.cs +++ b/aspnet-core/modules/dynamic-queryable/LINGYUN.Abp.Dynamic.Queryable.Application.Contracts/LINGYUN/Abp/Dynamic/Queryable/IDynamicQueryableAppService.cs @@ -13,7 +13,7 @@ public interface IDynamicQueryableAppService /// /// 根据动态条件查询数据 /// - /// + /// /// - Task> GetListAsync(GetListByDynamicQueryableInput input); + Task> GetListAsync(GetListByDynamicQueryableInput dynamicInput); } diff --git a/aspnet-core/modules/dynamic-queryable/LINGYUN.Abp.Dynamic.Queryable.Application/LINGYUN/Abp/Dynamic/Queryable/DynamicQueryableAppService.cs b/aspnet-core/modules/dynamic-queryable/LINGYUN.Abp.Dynamic.Queryable.Application/LINGYUN/Abp/Dynamic/Queryable/DynamicQueryableAppService.cs index 3bd8bb894..fb479f56d 100644 --- a/aspnet-core/modules/dynamic-queryable/LINGYUN.Abp.Dynamic.Queryable.Application/LINGYUN/Abp/Dynamic/Queryable/DynamicQueryableAppService.cs +++ b/aspnet-core/modules/dynamic-queryable/LINGYUN.Abp.Dynamic.Queryable.Application/LINGYUN/Abp/Dynamic/Queryable/DynamicQueryableAppService.cs @@ -56,16 +56,16 @@ public abstract class DynamicQueryableAppService : Applicat /// /// 根据动态条件查询数据 /// - /// + /// /// - public async virtual Task> GetListAsync(GetListByDynamicQueryableInput input) + public async virtual Task> GetListAsync(GetListByDynamicQueryableInput dynamicInput) { Expression> condition = (e) => true; - condition = condition.DynamicQuery(input.Queryable); + condition = condition.DynamicQuery(dynamicInput.Queryable); var totalCount = await GetCountAsync(condition); - var entities = await GetListAsync(condition, input); + var entities = await GetListAsync(condition, dynamicInput); return new PagedResultDto(totalCount, MapToEntitiesDto(entities)); diff --git a/aspnet-core/modules/dynamic-queryable/LINGYUN.Abp.Dynamic.Queryable.HttpApi/LINGYUN/Abp/Dynamic/Queryable/DynamicQueryableControllerBase.cs b/aspnet-core/modules/dynamic-queryable/LINGYUN.Abp.Dynamic.Queryable.HttpApi/LINGYUN/Abp/Dynamic/Queryable/DynamicQueryableControllerBase.cs index 17bfe2755..1fc52d338 100644 --- a/aspnet-core/modules/dynamic-queryable/LINGYUN.Abp.Dynamic.Queryable.HttpApi/LINGYUN/Abp/Dynamic/Queryable/DynamicQueryableControllerBase.cs +++ b/aspnet-core/modules/dynamic-queryable/LINGYUN.Abp.Dynamic.Queryable.HttpApi/LINGYUN/Abp/Dynamic/Queryable/DynamicQueryableControllerBase.cs @@ -24,8 +24,8 @@ public abstract class DynamicQueryableControllerBase : AbpController [HttpPost] [Route("search")] - public Task> GetListAsync(GetListByDynamicQueryableInput input) + public Task> GetListAsync(GetListByDynamicQueryableInput dynamicInput) { - return DynamicQueryableAppService.GetListAsync(input); + return DynamicQueryableAppService.GetListAsync(dynamicInput); } }