update 删除所有Xn前缀, 规范了所有分页参数和返回值
This commit is contained in:
@@ -6,7 +6,7 @@ namespace Ewide.Core.Service
|
||||
/// <summary>
|
||||
/// 用户参数
|
||||
/// </summary>
|
||||
public class UserInput : XnInputBase
|
||||
public class UserInput : InputBase
|
||||
{
|
||||
/// <summary>
|
||||
/// 账号
|
||||
|
||||
@@ -62,6 +62,16 @@ namespace Ewide.Core.Service
|
||||
/// </summary>
|
||||
public virtual int Status { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 所在机构名称
|
||||
/// </summary>
|
||||
public virtual string OrgName { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 角色名称
|
||||
/// </summary>
|
||||
public virtual string RoleName { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 员工信息
|
||||
/// </summary>
|
||||
|
||||
@@ -69,7 +69,7 @@ namespace Ewide.Core.Service
|
||||
.Where(input.SearchStatus >= 0, x => x.n.u.Status == input.SearchStatus)
|
||||
.Where(!superAdmin, x => x.n.u.AdminType != AdminType.SuperAdmin)
|
||||
.Where(!superAdmin && dataScopes.Count > 0, x => dataScopes.Contains(x.n.e.OrgId))
|
||||
.Select(u => u.n.u.Adapt<UserOutput>()).ToPagedListAsync(input.PageNo, input.PageSize);
|
||||
.Select(u => u.n.u.Adapt<UserOutput>()).ToPagedListAsync(input.PageIndex, input.PageSize);
|
||||
|
||||
//var emps = new List<Task<EmpOutput>>();
|
||||
//users.Items.ToList().ForEach(u =>
|
||||
@@ -81,7 +81,7 @@ namespace Ewide.Core.Service
|
||||
{
|
||||
user.SysEmpInfo = await _sysEmpService.GetEmpInfo(user.Id);
|
||||
}
|
||||
return XnPageResult<UserOutput>.PageResult(users);
|
||||
return PageDataResult<UserOutput>.PageResult(users);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
||||
Reference in New Issue
Block a user