From a644cc267355b184c0cf8e6ceb6d4fde4caa0a31 Mon Sep 17 00:00:00 2001 From: Ky_Gyt <1971574843@qq.com> Date: Fri, 30 Apr 2021 16:57:04 +0800 Subject: [PATCH] =?UTF-8?q?Update=20=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Api/Ewide.Core/Extension/PageExtensions.cs | 2 +- Api/Ewide.Core/Service/Config/SysConfigService.cs | 5 +++-- Api/Ewide.Core/Service/Dict/SysDictDataService.cs | 6 ++++-- Api/Ewide.Core/Service/Dict/SysDictTypeService.cs | 6 ++++-- Api/Ewide.Core/Service/Org/SysOrgService.cs | 8 +++++--- Api/Ewide.Core/Service/Pos/Dto/PosInput.cs | 2 +- Api/Ewide.Core/Service/Pos/SysPosService.cs | 6 ++++-- Api/Ewide.Core/Service/Role/SysRoleService.cs | 5 +++-- 8 files changed, 25 insertions(+), 15 deletions(-) diff --git a/Api/Ewide.Core/Extension/PageExtensions.cs b/Api/Ewide.Core/Extension/PageExtensions.cs index e94e02f..bf16fd2 100644 --- a/Api/Ewide.Core/Extension/PageExtensions.cs +++ b/Api/Ewide.Core/Extension/PageExtensions.cs @@ -20,7 +20,7 @@ namespace Ewide.Core.Extension var hasId = type.GetProperty("Id") != null; var hasSort = type.GetProperty("Sort") != null; - var defaultField = hasId ? "Id" : (hasSort ? "Sort" : ""); + var defaultField = hasSort ? "Sort" : (hasId ? "Id" : ""); // 约定默认每张表都有Id排序 var orderStr = string.IsNullOrEmpty(defaultField) ? "" : defaultField + (descSort ? " Desc" : " Asc"); diff --git a/Api/Ewide.Core/Service/Config/SysConfigService.cs b/Api/Ewide.Core/Service/Config/SysConfigService.cs index 2c6be82..ea576bb 100644 --- a/Api/Ewide.Core/Service/Config/SysConfigService.cs +++ b/Api/Ewide.Core/Service/Config/SysConfigService.cs @@ -1,4 +1,5 @@ -using Furion.DatabaseAccessor; +using Ewide.Core.Extension; +using Furion.DatabaseAccessor; using Furion.DatabaseAccessor.Extensions; using Furion.DependencyInjection; using Furion.DynamicApiController; @@ -42,7 +43,7 @@ namespace Ewide.Core.Service (code, u => EF.Functions.Like(u.Code, $"%{input.Code.Trim()}%")), (groupCode, u => EF.Functions.Like(u.Code, $"%{input.GroupCode.Trim()}%"))) .Where(u => u.Status != CommonStatus.DELETED).OrderBy(u => u.GroupCode) - .ToPagedListAsync(input.PageNo, input.PageSize); + .ToPageData(input); return XnPageResult.PageResult(configs); } diff --git a/Api/Ewide.Core/Service/Dict/SysDictDataService.cs b/Api/Ewide.Core/Service/Dict/SysDictDataService.cs index 0256f95..0d7f1ba 100644 --- a/Api/Ewide.Core/Service/Dict/SysDictDataService.cs +++ b/Api/Ewide.Core/Service/Dict/SysDictDataService.cs @@ -1,4 +1,5 @@ using Furion.DatabaseAccessor; +using Ewide.Core.Extension; using Furion.DatabaseAccessor.Extensions; using Furion.DependencyInjection; using Furion.DynamicApiController; @@ -40,8 +41,9 @@ namespace Ewide.Core.Service .Where((code, u => EF.Functions.Like(u.Code, $"%{input.Code.Trim()}%")), (value, u => EF.Functions.Like(u.Value, $"%{input.Value.Trim()}%"))) .Where(u => u.Status != CommonStatus.DELETED).OrderBy(u => u.Sort) - .Select(u => u.Adapt()) - .ToPagedListAsync(input.PageNo, input.PageSize); + //.Select(u => u.Adapt()) + // .ToPagedListAsync(input.PageNo, input.PageSize) + .ToPageData(input); return XnPageResult.PageResult(dictDatas); } diff --git a/Api/Ewide.Core/Service/Dict/SysDictTypeService.cs b/Api/Ewide.Core/Service/Dict/SysDictTypeService.cs index 780fa25..c9074bc 100644 --- a/Api/Ewide.Core/Service/Dict/SysDictTypeService.cs +++ b/Api/Ewide.Core/Service/Dict/SysDictTypeService.cs @@ -1,4 +1,5 @@ -using Furion.DatabaseAccessor; +using Ewide.Core.Extension; +using Furion.DatabaseAccessor; using Furion.DatabaseAccessor.Extensions; using Furion.DependencyInjection; using Furion.DynamicApiController; @@ -43,7 +44,8 @@ namespace Ewide.Core.Service .Where((code, u => EF.Functions.Like(u.Code, $"%{input.Code.Trim()}%")), (name, u => EF.Functions.Like(u.Name, $"%{input.Name.Trim()}%"))) .Where(u => u.Status != CommonStatus.DELETED).OrderBy(u => u.Sort) - .ToPagedListAsync(input.PageNo, input.PageSize); + //.ToPagedListAsync(input.PageNo, input.PageSize); + .ToPageData(input); return XnPageResult.PageResult(dictTypes); } diff --git a/Api/Ewide.Core/Service/Org/SysOrgService.cs b/Api/Ewide.Core/Service/Org/SysOrgService.cs index b9f2d2e..6e1cee8 100644 --- a/Api/Ewide.Core/Service/Org/SysOrgService.cs +++ b/Api/Ewide.Core/Service/Org/SysOrgService.cs @@ -1,4 +1,5 @@ -using Furion; +using Ewide.Core.Extension; +using Furion; using Furion.DatabaseAccessor; using Furion.DatabaseAccessor.Extensions; using Furion.DependencyInjection; @@ -62,8 +63,9 @@ namespace Ewide.Core.Service || u.Id == input.Pid.Trim())) // 根据父机构id查询 .Where(dataScopeList.Count > 0, u => dataScopeList.Contains(u.Id)) // 非管理员范围限制 .Where(u => u.Status != CommonStatus.DELETED).OrderBy(u => u.Sort) - .Select(u => u.Adapt()) - .ToPagedListAsync(input.PageNo, input.PageSize); + .ToPageData(input); + //.Select(u => u.Adapt()) + //.ToPagedListAsync(input.PageNo, input.PageSize); return XnPageResult.PageResult(orgs); } diff --git a/Api/Ewide.Core/Service/Pos/Dto/PosInput.cs b/Api/Ewide.Core/Service/Pos/Dto/PosInput.cs index e93847d..91917d5 100644 --- a/Api/Ewide.Core/Service/Pos/Dto/PosInput.cs +++ b/Api/Ewide.Core/Service/Pos/Dto/PosInput.cs @@ -5,7 +5,7 @@ namespace Ewide.Core.Service /// /// 职位参数 /// - public class PosInput + public class PosInput : PageInputBase { /// /// 名称 diff --git a/Api/Ewide.Core/Service/Pos/SysPosService.cs b/Api/Ewide.Core/Service/Pos/SysPosService.cs index b68b272..2e3573c 100644 --- a/Api/Ewide.Core/Service/Pos/SysPosService.cs +++ b/Api/Ewide.Core/Service/Pos/SysPosService.cs @@ -1,4 +1,5 @@ -using Furion.DatabaseAccessor; +using Ewide.Core.Extension; +using Furion.DatabaseAccessor; using Furion.DatabaseAccessor.Extensions; using Furion.DependencyInjection; using Furion.DynamicApiController; @@ -45,7 +46,8 @@ namespace Ewide.Core.Service .Where((name, u => EF.Functions.Like(u.Name, $"%{input.Name.Trim()}%")), (code, u => EF.Functions.Like(u.Code, $"%{input.Code.Trim()}%"))) .Where(u => u.Status == CommonStatus.ENABLE).OrderBy(u => u.Sort) - .ToPagedListAsync(input.PageNo, input.PageSize); + .ToPageData(input); + //.ToPagedListAsync(input.PageNo, input.PageSize); return XnPageResult.PageResult(pos); } diff --git a/Api/Ewide.Core/Service/Role/SysRoleService.cs b/Api/Ewide.Core/Service/Role/SysRoleService.cs index 975d664..7813dba 100644 --- a/Api/Ewide.Core/Service/Role/SysRoleService.cs +++ b/Api/Ewide.Core/Service/Role/SysRoleService.cs @@ -1,4 +1,5 @@ -using Furion.DatabaseAccessor; +using Ewide.Core.Extension; +using Furion.DatabaseAccessor; using Furion.DatabaseAccessor.Extensions; using Furion.DependencyInjection; using Furion.DynamicApiController; @@ -68,7 +69,7 @@ namespace Ewide.Core.Service .Where((name, u => EF.Functions.Like(u.Name, $"%{input.Name.Trim()}%")), (code, u => EF.Functions.Like(u.Code, $"%{input.Code.Trim()}%"))) .Where(u => u.Status == (int)CommonStatus.ENABLE).OrderBy(u => u.Sort) - .ToPagedListAsync(input.PageNo, input.PageSize); + .ToPageData(input); return XnPageResult.PageResult(roles); }