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

update 完成片区新增

Browse Source
This commit is contained in:
自带大佬气场
2021-06-01 10:54:07 +08:00
parent 08e4573e19
commit 483b15c013
17 changed files with 756 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
Api/Ewide.Core/Ewide.Core.xml
View File

@@ -2734,12 +2734,17 @@
用户管理
</summary>
</member>
<member name="M:Ewide.Core.UserManager.CheckUserAsync(System.String,System.Boolean)">
<member name="M:Ewide.Core.UserManager.CheckUserAsync(System.String)">
<summary>
获取用户信息
</summary>
<param name="userId"></param>
<param name="tracking"></param>
<returns></returns>
</member>
<member name="M:Ewide.Core.UserManager.CheckUserAsync">
<summary>
获取用户信息
</summary>
<returns></returns>
</member>
<member name="M:Ewide.Core.UserManager.GetUserEmpInfo(System.String)">
@@ -2749,6 +2754,51 @@
<param name="userId"></param>
<returns></returns>
</member>
<member name="M:Ewide.Core.UserManager.GetUserEmpInfo">
<summary>
获取用户员工信息
</summary>
<returns></returns>
</member>
<member name="M:Ewide.Core.UserManager.GetUserOrgInfo(System.String)">
<summary>
获取用户部门信息
</summary>
<param name="userId"></param>
<returns></returns>
</member>
<member name="M:Ewide.Core.UserManager.GetUserOrgInfo">
<summary>
获取用户部门信息
</summary>
<returns></returns>
</member>
<member name="M:Ewide.Core.UserManager.GetUserRoleIdList(System.String)">
<summary>
获取用户角色Id列表
</summary>
<param name="userId"></param>
<returns></returns>
</member>
<member name="M:Ewide.Core.UserManager.GetUserRoleIdList">
<summary>
获取用户角色Id列表
</summary>
<returns></returns>
</member>
<member name="M:Ewide.Core.UserManager.GetUserRoleList(System.String)">
<summary>
获取用户角色列表
</summary>
<param name="userId"></param>
<returns></returns>
</member>
<member name="M:Ewide.Core.UserManager.GetUserRoleList">
<summary>
获取用户角色列表
</summary>
<returns></returns>
</member>
<member name="T:Ewide.Core.OAuth.OAuthConfig">
<summary>
OAuth配置---此结构方便拓展
@@ -5607,6 +5657,11 @@
值
</summary>
</member>
<member name="P:Ewide.Core.Service.OrgTreeNode.Type">
<summary>
类型
</summary>
</member>
<member name="P:Ewide.Core.Service.OrgTreeNode.Weight">
<summary>
排序，越小优先级越高

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

@@ -33,7 +33,7 @@ namespace Ewide.Core.Extension
var hasSort = type.GetProperty("Sort") != null;
var hasCreatedTime = type.GetProperty("CreatedTime") != null;
var defaultField = hasCreatedTime ? "CreatedTime" : hasSort ? "Sort" : hasId ? "Id" : "";
var defaultField = hasSort ? "Sort" : hasCreatedTime ? "CreatedTime" : hasId ? "Id" : "";
// 排序优先级 创建时间->序号->ID
var orderStr = string.IsNullOrEmpty(defaultField) ? "" : defaultField + (descSort ? " Desc" : " Asc");

5
Api/Ewide.Core/Service/Org/Dto/OrgTreeNode.cs
View File

@@ -28,6 +28,11 @@ namespace Ewide.Core.Service
/// </summary>
public string Value { get; set; }
/// <summary>
/// 类型
/// </summary>
public int Type { get; set; }
/// <summary>
/// 排序，越小优先级越高
/// </summary>

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

@@ -125,12 +125,10 @@ namespace Ewide.Core.Service
[HttpPost("/sysOrg/add")]
public async Task AddOrg(AddOrgInput input)
{
if (!string.IsNullOrEmpty(input.Code))
{
var isExist = await _sysOrgRep.DetachedEntities.AnyAsync(u => u.Code == input.Code);
if (isExist)
throw Oops.Oh(ErrorCode.D2002);
}
var isExist = await _sysOrgRep.DetachedEntities
.AnyAsync(u => (u.Pid == input.Pid && u.Name == input.Name) || (!string.IsNullOrEmpty(input.Code) && u.Code == input.Code));
if (isExist)
throw Oops.Oh(ErrorCode.D2002);
if (!_userManager.SuperAdmin)
{
@@ -239,12 +237,10 @@ namespace Ewide.Core.Service
if (!_userManager.SuperAdmin && (dataScopes.Count < 1 || !dataScopes.Contains(sysOrg.Id)))
throw Oops.Oh(ErrorCode.D2003);
if (!string.IsNullOrEmpty(input.Code))
{
var isExist = await _sysOrgRep.DetachedEntities.AnyAsync(u => u.Code == input.Code && u.Id != sysOrg.Id);
if (isExist)
throw Oops.Oh(ErrorCode.D2002);
}
var isExist = await _sysOrgRep.DetachedEntities
.AnyAsync(u => ((u.Pid == input.Pid && u.Name == input.Name) || (!string.IsNullOrEmpty(input.Code) && u.Code == input.Code)) && u.Id != sysOrg.Id);
if (isExist)
throw Oops.Oh(ErrorCode.D2002);
// 如果名称有变化，则修改对应员工的机构相关信息
if (!sysOrg.Name.Equals(input.Name))
@@ -309,6 +305,7 @@ namespace Ewide.Core.Service
Id = u.Id,
ParentId = u.Pid,
Title = u.Name,
Type = u.Type,
Value = u.Id.ToString(),
Weight = u.Sort
}).ToListAsync();