ewide/zsxt_nbzs_h5
22
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of http://118.178.224.202:3000/ewide/ewide_core

Browse Source
This commit is contained in:
自带大佬气场
2021-04-30 17:21:15 +08:00
parent 794116acdb 9ca1b0a2bf
commit f6790ef78c
9 changed files with 31 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Api/Ewide.Core/Extension/PageExtensions.cs
View File

@@ -20,7 +20,7 @@ namespace Ewide.Core.Extension
var hasId = type.GetProperty("Id") != null; var hasId = type.GetProperty("Id") != null;
var hasSort = type.GetProperty("Sort") != null; var hasSort = type.GetProperty("Sort") != null;
var defaultField = hasId ? "Id" : (hasSort ? "Sort" : ""); var defaultField = hasSort ? "Sort" : (hasId ? "Id" : "");
// 约定默认每张表都有Id排序 // 约定默认每张表都有Id排序
var orderStr = string.IsNullOrEmpty(defaultField) ? "" : defaultField + (descSort ? " Desc" : " Asc"); var orderStr = string.IsNullOrEmpty(defaultField) ? "" : defaultField + (descSort ? " Desc" : " Asc");

5
Api/Ewide.Core/Service/Config/SysConfigService.cs
View File

@@ -1,4 +1,5 @@
using Furion.DatabaseAccessor; using Ewide.Core.Extension;
using Furion.DatabaseAccessor;
using Furion.DatabaseAccessor.Extensions; using Furion.DatabaseAccessor.Extensions;
using Furion.DependencyInjection; using Furion.DependencyInjection;
using Furion.DynamicApiController; using Furion.DynamicApiController;
@@ -42,7 +43,7 @@ namespace Ewide.Core.Service
(code, u => EF.Functions.Like(u.Code, $"%{input.Code.Trim()}%")), (code, u => EF.Functions.Like(u.Code, $"%{input.Code.Trim()}%")),
(groupCode, u => EF.Functions.Like(u.Code, $"%{input.GroupCode.Trim()}%"))) (groupCode, u => EF.Functions.Like(u.Code, $"%{input.GroupCode.Trim()}%")))
.Where(u => u.Status != CommonStatus.DELETED).OrderBy(u => u.GroupCode) .Where(u => u.Status != CommonStatus.DELETED).OrderBy(u => u.GroupCode)
.ToPagedListAsync(input.PageNo, input.PageSize); .ToPageData(input);
return XnPageResult<SysConfig>.PageResult(configs); return XnPageResult<SysConfig>.PageResult(configs);
} }

6
Api/Ewide.Core/Service/Dict/SysDictDataService.cs
View File

@@ -1,4 +1,5 @@
using Furion.DatabaseAccessor; using Furion.DatabaseAccessor;
using Ewide.Core.Extension;
using Furion.DatabaseAccessor.Extensions; using Furion.DatabaseAccessor.Extensions;
using Furion.DependencyInjection; using Furion.DependencyInjection;
using Furion.DynamicApiController; using Furion.DynamicApiController;
@@ -40,8 +41,9 @@ namespace Ewide.Core.Service
.Where((code, u => EF.Functions.Like(u.Code, $"%{input.Code.Trim()}%")), .Where((code, u => EF.Functions.Like(u.Code, $"%{input.Code.Trim()}%")),
(value, u => EF.Functions.Like(u.Value, $"%{input.Value.Trim()}%"))) (value, u => EF.Functions.Like(u.Value, $"%{input.Value.Trim()}%")))
.Where(u => u.Status != CommonStatus.DELETED).OrderBy(u => u.Sort) .Where(u => u.Status != CommonStatus.DELETED).OrderBy(u => u.Sort)
.Select(u => u.Adapt<DictDataOutput>()) //.Select(u => u.Adapt<DictDataOutput>())
.ToPagedListAsync(input.PageNo, input.PageSize); // .ToPagedListAsync(input.PageNo, input.PageSize)
.ToPageData<SysDictData, DictDataOutput>(input);
return XnPageResult<DictDataOutput>.PageResult(dictDatas); return XnPageResult<DictDataOutput>.PageResult(dictDatas);
} }

6
Api/Ewide.Core/Service/Dict/SysDictTypeService.cs
View File

@@ -1,4 +1,5 @@
using Furion.DatabaseAccessor; using Ewide.Core.Extension;
using Furion.DatabaseAccessor;
using Furion.DatabaseAccessor.Extensions; using Furion.DatabaseAccessor.Extensions;
using Furion.DependencyInjection; using Furion.DependencyInjection;
using Furion.DynamicApiController; using Furion.DynamicApiController;
@@ -43,7 +44,8 @@ namespace Ewide.Core.Service
.Where((code, u => EF.Functions.Like(u.Code, $"%{input.Code.Trim()}%")), .Where((code, u => EF.Functions.Like(u.Code, $"%{input.Code.Trim()}%")),
(name, u => EF.Functions.Like(u.Name, $"%{input.Name.Trim()}%"))) (name, u => EF.Functions.Like(u.Name, $"%{input.Name.Trim()}%")))
.Where(u => u.Status != CommonStatus.DELETED).OrderBy(u => u.Sort) .Where(u => u.Status != CommonStatus.DELETED).OrderBy(u => u.Sort)
.ToPagedListAsync(input.PageNo, input.PageSize); //.ToPagedListAsync(input.PageNo, input.PageSize);
.ToPageData(input);
return XnPageResult<SysDictType>.PageResult(dictTypes); return XnPageResult<SysDictType>.PageResult(dictTypes);
} }

8
Api/Ewide.Core/Service/Org/SysOrgService.cs
View File

@@ -1,4 +1,5 @@
using Furion; using Ewide.Core.Extension;
using Furion;
using Furion.DatabaseAccessor; using Furion.DatabaseAccessor;
using Furion.DatabaseAccessor.Extensions; using Furion.DatabaseAccessor.Extensions;
using Furion.DependencyInjection; using Furion.DependencyInjection;
@@ -62,8 +63,9 @@ namespace Ewide.Core.Service
|| u.Id == input.Pid.Trim())) // 根据父机构id查询 || u.Id == input.Pid.Trim())) // 根据父机构id查询
.Where(dataScopeList.Count > 0, u => dataScopeList.Contains(u.Id)) // 非管理员范围限制 .Where(dataScopeList.Count > 0, u => dataScopeList.Contains(u.Id)) // 非管理员范围限制
.Where(u => u.Status != CommonStatus.DELETED).OrderBy(u => u.Sort) .Where(u => u.Status != CommonStatus.DELETED).OrderBy(u => u.Sort)
.Select(u => u.Adapt<OrgOutput>()) .ToPageData<SysOrg,OrgOutput>(input);
.ToPagedListAsync(input.PageNo, input.PageSize); //.Select(u => u.Adapt<OrgOutput>())
//.ToPagedListAsync(input.PageNo, input.PageSize);
return XnPageResult<OrgOutput>.PageResult(orgs); return XnPageResult<OrgOutput>.PageResult(orgs);
} }

2
Api/Ewide.Core/Service/Pos/Dto/PosInput.cs
View File

@@ -5,7 +5,7 @@ namespace Ewide.Core.Service
/// <summary> /// <summary>
/// 职位参数 /// 职位参数
/// </summary> /// </summary>
public class PosInput public class PosInput : PageInputBase
{ {
/// <summary> /// <summary>
/// 名称 /// 名称

6
Api/Ewide.Core/Service/Pos/SysPosService.cs
View File

@@ -1,4 +1,5 @@
using Furion.DatabaseAccessor; using Ewide.Core.Extension;
using Furion.DatabaseAccessor;
using Furion.DatabaseAccessor.Extensions; using Furion.DatabaseAccessor.Extensions;
using Furion.DependencyInjection; using Furion.DependencyInjection;
using Furion.DynamicApiController; using Furion.DynamicApiController;
@@ -45,7 +46,8 @@ namespace Ewide.Core.Service
.Where((name, u => EF.Functions.Like(u.Name, $"%{input.Name.Trim()}%")), .Where((name, u => EF.Functions.Like(u.Name, $"%{input.Name.Trim()}%")),
(code, u => EF.Functions.Like(u.Code, $"%{input.Code.Trim()}%"))) (code, u => EF.Functions.Like(u.Code, $"%{input.Code.Trim()}%")))
.Where(u => u.Status == CommonStatus.ENABLE).OrderBy(u => u.Sort) .Where(u => u.Status == CommonStatus.ENABLE).OrderBy(u => u.Sort)
.ToPagedListAsync(input.PageNo, input.PageSize); .ToPageData(input);
//.ToPagedListAsync(input.PageNo, input.PageSize);
return XnPageResult<SysPos>.PageResult(pos); return XnPageResult<SysPos>.PageResult(pos);
} }

5
Api/Ewide.Core/Service/Role/SysRoleService.cs
View File

@@ -1,4 +1,5 @@
using Furion.DatabaseAccessor; using Ewide.Core.Extension;
using Furion.DatabaseAccessor;
using Furion.DatabaseAccessor.Extensions; using Furion.DatabaseAccessor.Extensions;
using Furion.DependencyInjection; using Furion.DependencyInjection;
using Furion.DynamicApiController; using Furion.DynamicApiController;
@@ -68,7 +69,7 @@ namespace Ewide.Core.Service
.Where((name, u => EF.Functions.Like(u.Name, $"%{input.Name.Trim()}%")), .Where((name, u => EF.Functions.Like(u.Name, $"%{input.Name.Trim()}%")),
(code, u => EF.Functions.Like(u.Code, $"%{input.Code.Trim()}%"))) (code, u => EF.Functions.Like(u.Code, $"%{input.Code.Trim()}%")))
.Where(u => u.Status == (int)CommonStatus.ENABLE).OrderBy(u => u.Sort) .Where(u => u.Status == (int)CommonStatus.ENABLE).OrderBy(u => u.Sort)
.ToPagedListAsync(input.PageNo, input.PageSize); .ToPageData(input);
return XnPageResult<SysRole>.PageResult(roles); return XnPageResult<SysRole>.PageResult(roles);
} }

12
Web/src/pages/system/area/index.vue
View File

@@ -66,32 +66,32 @@ export default {
title: '参数类型', title: '参数类型',
dataIndex: 'levelType', dataIndex: 'levelType',
scopedSlots: { customRender: 'levelType' }, scopedSlots: { customRender: 'levelType' },
sorter: false, sorter: true,
}, },
{ {
title: '参数名称', title: '参数名称',
dataIndex: 'name', dataIndex: 'name',
sorter: false, sorter: true,
}, },
{ {
title: '参数编号', title: '参数编号',
dataIndex: 'code', dataIndex: 'code',
sorter: false, sorter: true,
}, },
{ {
title: '显示编号', title: '显示编号',
dataIndex: 'showCode', dataIndex: 'showCode',
sorter: false, sorter: true,
}, },
{ {
title: '描述', title: '描述',
dataIndex: 'note', dataIndex: 'note',
sorter: false, sorter: true,
}, },
{ {
title: '序号', title: '序号',
dataIndex: 'sort', dataIndex: 'sort',
sorter: false, sorter: true,
}, },
], ],
codes: { codes: {