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

Browse Source
This commit is contained in:
Xy
2021-04-23 11:00:44 +00:00
parent 068d4796b6
commit a37d153e5d
3 changed files with 61 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

110
Api/Dilon.Core/Dilon.Core.xml
View File

@@ -2526,7 +2526,7 @@
用户管理
</summary>
</member>
<member name="M:Dilon.Core.UserManager.CheckUserAsync(System.Int64,System.Boolean)">
<member name="M:Dilon.Core.UserManager.CheckUserAsync(System.String,System.Boolean)">
<summary>
获取用户信息
</summary>
@@ -2534,7 +2534,7 @@
<param name="tracking"></param>
<returns></returns>
</member>
<member name="M:Dilon.Core.UserManager.GetUserEmpInfo(System.Int64)">
<member name="M:Dilon.Core.UserManager.GetUserEmpInfo(System.String)">
<summary>
获取用户员工信息
</summary>
@@ -2922,7 +2922,7 @@
系统应用服务
</summary>
</member>
<member name="M:Dilon.Core.Service.SysAppService.GetLoginApps(System.Int64)">
<member name="M:Dilon.Core.Service.SysAppService.GetLoginApps(System.String)">
<summary>
获取用户应用相关信息
</summary>
@@ -3166,14 +3166,14 @@
系统缓存服务
</summary>
</member>
<member name="M:Dilon.Core.Service.SysCacheService.GetDataScope(System.Int64)">
<member name="M:Dilon.Core.Service.SysCacheService.GetDataScope(System.String)">
<summary>
获取数据范围缓存（机构Id集合）
</summary>
<param name="userId"></param>
<returns></returns>
</member>
<member name="M:Dilon.Core.Service.SysCacheService.SetDataScope(System.Int64,System.Collections.Generic.List{System.Int64})">
<member name="M:Dilon.Core.Service.SysCacheService.SetDataScope(System.String,System.Collections.Generic.List{System.String})">
<summary>
缓存数据范围（机构Id集合）
</summary>
@@ -3181,7 +3181,7 @@
<param name="dataScopes"></param>
<returns></returns>
</member>
<member name="M:Dilon.Core.Service.SysCacheService.GetMenu(System.Int64,System.String)">
<member name="M:Dilon.Core.Service.SysCacheService.GetMenu(System.String,System.String)">
<summary>
获取菜单缓存
</summary>
@@ -3189,7 +3189,7 @@
<param name="appCode"></param>
<returns></returns>
</member>
<member name="M:Dilon.Core.Service.SysCacheService.SetMenu(System.Int64,System.String,System.Collections.Generic.List{Dilon.Core.Service.AntDesignTreeNode})">
<member name="M:Dilon.Core.Service.SysCacheService.SetMenu(System.String,System.String,System.Collections.Generic.List{Dilon.Core.Service.AntDesignTreeNode})">
<summary>
缓存菜单
</summary>
@@ -3198,14 +3198,14 @@
<param name="menus"></param>
<returns></returns>
</member>
<member name="M:Dilon.Core.Service.SysCacheService.GetPermission(System.Int64)">
<member name="M:Dilon.Core.Service.SysCacheService.GetPermission(System.String)">
<summary>
获取权限缓存（按钮）
</summary>
<param name="userId"></param>
<returns></returns>
</member>
<member name="M:Dilon.Core.Service.SysCacheService.SetPermission(System.Int64,System.Collections.Generic.List{System.String})">
<member name="M:Dilon.Core.Service.SysCacheService.SetPermission(System.String,System.Collections.Generic.List{System.String})">
<summary>
缓存权限
</summary>
@@ -3275,7 +3275,7 @@
<param name="input"></param>
<returns></returns>
</member>
<member name="M:Dilon.Core.Service.CodeGenConfigService.Delete(System.Int64)">
<member name="M:Dilon.Core.Service.CodeGenConfigService.Delete(System.String)">
<summary>
删除
</summary>
@@ -4038,14 +4038,14 @@
<param name="input"></param>
<returns></returns>
</member>
<member name="M:Dilon.Core.Service.SysDictDataService.GetDictDataListByDictTypeId(System.Int64)">
<member name="M:Dilon.Core.Service.SysDictDataService.GetDictDataListByDictTypeId(System.String)">
<summary>
根据字典类型Id获取字典值集合
</summary>
<param name="dictTypeId"></param>
<returns></returns>
</member>
<member name="M:Dilon.Core.Service.SysDictDataService.DeleteByTypeId(System.Int64)">
<member name="M:Dilon.Core.Service.SysDictDataService.DeleteByTypeId(System.String)">
<summary>
删除字典下所有值
</summary>
@@ -4241,34 +4241,34 @@
员工附属机构和职位服务
</summary>
</member>
<member name="M:Dilon.Core.Service.SysEmpExtOrgPosService.AddOrUpdate(System.Int64,System.Collections.Generic.List{Dilon.Core.Service.EmpExtOrgPosOutput})">
<member name="M:Dilon.Core.Service.SysEmpExtOrgPosService.AddOrUpdate(System.String,System.Collections.Generic.List{Dilon.Core.Service.EmpExtOrgPosOutput})">
<summary>
保存或编辑附属机构相关信息
</summary>
<returns></returns>
</member>
<member name="M:Dilon.Core.Service.SysEmpExtOrgPosService.GetEmpExtOrgPosList(System.Int64)">
<member name="M:Dilon.Core.Service.SysEmpExtOrgPosService.GetEmpExtOrgPosList(System.String)">
<summary>
获取附属机构和职位信息
</summary>
<param name="empId"></param>
<returns></returns>
</member>
<member name="M:Dilon.Core.Service.SysEmpExtOrgPosService.HasExtOrgEmp(System.Int64)">
<member name="M:Dilon.Core.Service.SysEmpExtOrgPosService.HasExtOrgEmp(System.String)">
<summary>
根据机构Id判断该附属机构下是否有员工
</summary>
<param name="orgId"></param>
<returns></returns>
</member>
<member name="M:Dilon.Core.Service.SysEmpExtOrgPosService.HasExtPosEmp(System.Int64)">
<member name="M:Dilon.Core.Service.SysEmpExtOrgPosService.HasExtPosEmp(System.String)">
<summary>
根据职位Id判断该附属职位下是否有员工
</summary>
<param name="posId"></param>
<returns></returns>
</member>
<member name="M:Dilon.Core.Service.SysEmpExtOrgPosService.DeleteEmpExtInfoByUserId(System.Int64)">
<member name="M:Dilon.Core.Service.SysEmpExtOrgPosService.DeleteEmpExtInfoByUserId(System.String)">
<summary>
根据员工Id删除对应的员工-附属信息
</summary>
@@ -4280,7 +4280,7 @@
员工职位服务
</summary>
</member>
<member name="M:Dilon.Core.Service.SysEmpPosService.AddOrUpdate(System.Int64,System.Collections.Generic.List{System.Int64})">
<member name="M:Dilon.Core.Service.SysEmpPosService.AddOrUpdate(System.String,System.Collections.Generic.List{System.String})">
<summary>
增加或编辑员工职位相关信息
</summary>
@@ -4288,20 +4288,20 @@
<param name="posIdList">职位id集合</param>
<returns></returns>
</member>
<member name="M:Dilon.Core.Service.SysEmpPosService.GetEmpPosList(System.Int64)">
<member name="M:Dilon.Core.Service.SysEmpPosService.GetEmpPosList(System.String)">
<summary>
获取所属职位信息
</summary>
<param name="empId">员工Id（用户Id）</param>
</member>
<member name="M:Dilon.Core.Service.SysEmpPosService.HasPosEmp(System.Int64)">
<member name="M:Dilon.Core.Service.SysEmpPosService.HasPosEmp(System.String)">
<summary>
根据职位Id判断该职位下是否有员工
</summary>
<param name="posId"></param>
<returns></returns>
</member>
<member name="M:Dilon.Core.Service.SysEmpPosService.DeleteEmpPosInfoByUserId(System.Int64)">
<member name="M:Dilon.Core.Service.SysEmpPosService.DeleteEmpPosInfoByUserId(System.String)">
<summary>
根据员工Id删除对用的员工-职位信息
</summary>
@@ -4313,7 +4313,7 @@
员工服务
</summary>
</member>
<member name="M:Dilon.Core.Service.SysEmpService.GetEmpInfo(System.Int64)">
<member name="M:Dilon.Core.Service.SysEmpService.GetEmpInfo(System.String)">
<summary>
获取用户员工相关信息（包括登录）
</summary>
@@ -4326,7 +4326,7 @@
</summary>
<returns></returns>
</member>
<member name="M:Dilon.Core.Service.SysEmpService.UpdateEmpOrgInfo(System.Int64,System.String)">
<member name="M:Dilon.Core.Service.SysEmpService.UpdateEmpOrgInfo(System.String,System.String)">
<summary>
修改员工相关机构信息
</summary>
@@ -4334,21 +4334,21 @@
<param name="orgName"></param>
<returns></returns>
</member>
<member name="M:Dilon.Core.Service.SysEmpService.HasOrgEmp(System.Int64)">
<member name="M:Dilon.Core.Service.SysEmpService.HasOrgEmp(System.String)">
<summary>
根据机构Id判断该机构下是否有员工
</summary>
<param name="orgId"></param>
<returns></returns>
</member>
<member name="M:Dilon.Core.Service.SysEmpService.DeleteEmpInfoByUserId(System.Int64)">
<member name="M:Dilon.Core.Service.SysEmpService.DeleteEmpInfoByUserId(System.String)">
<summary>
根据员工Id删除对应的员工表信息
</summary>
<param name="empId"></param>
<returns></returns>
</member>
<member name="M:Dilon.Core.Service.SysEmpService.GetEmpOrgId(System.Int64)">
<member name="M:Dilon.Core.Service.SysEmpService.GetEmpOrgId(System.String)">
<summary>
获取员工机构Id
</summary>
@@ -4929,14 +4929,14 @@
系统菜单服务
</summary>
</member>
<member name="M:Dilon.Core.Service.SysMenuService.GetLoginPermissionList(System.Int64)">
<member name="M:Dilon.Core.Service.SysMenuService.GetLoginPermissionList(System.String)">
<summary>
获取用户权限(按钮权限标识集合)
</summary>
<param name="userId"></param>
<returns></returns>
</member>
<member name="M:Dilon.Core.Service.SysMenuService.GetLoginMenusAntDesign(System.Int64,System.String)">
<member name="M:Dilon.Core.Service.SysMenuService.GetLoginMenusAntDesign(System.String,System.String)">
<summary>
获取用户AntDesign菜单集合
</summary>
@@ -4944,7 +4944,7 @@
<param name="appCode"></param>
<returns></returns>
</member>
<member name="M:Dilon.Core.Service.SysMenuService.GetUserMenuAppCodeList(System.Int64)">
<member name="M:Dilon.Core.Service.SysMenuService.GetUserMenuAppCodeList(System.String)">
<summary>
获取用户菜单所属的应用编码集合
</summary>
@@ -4958,7 +4958,7 @@
<param name="input"></param>
<returns></returns>
</member>
<member name="M:Dilon.Core.Service.SysMenuService.CreateNewPids(System.Int64)">
<member name="M:Dilon.Core.Service.SysMenuService.CreateNewPids(System.String)">
<summary>
创建Pids格式
如果pid是0顶级节点，pids就是 [0];
@@ -5297,7 +5297,7 @@
通知公告用户
</summary>
</member>
<member name="M:Dilon.Core.Service.Notice.SysNoticeUserService.Add(System.Int64,System.Collections.Generic.List{System.Int64},System.Int32)">
<member name="M:Dilon.Core.Service.Notice.SysNoticeUserService.Add(System.String,System.Collections.Generic.List{System.String},System.Int32)">
<summary>
增加
</summary>
@@ -5306,7 +5306,7 @@
<param name="noticeUserStatus"></param>
<returns></returns>
</member>
<member name="M:Dilon.Core.Service.Notice.SysNoticeUserService.Update(System.Int64,System.Collections.Generic.List{System.Int64},System.Int32)">
<member name="M:Dilon.Core.Service.Notice.SysNoticeUserService.Update(System.String,System.Collections.Generic.List{System.String},System.Int32)">
<summary>
更新
</summary>
@@ -5315,14 +5315,14 @@
<param name="noticeUserStatus"></param>
<returns></returns>
</member>
<member name="M:Dilon.Core.Service.Notice.SysNoticeUserService.GetNoticeUserListByNoticeId(System.Int64)">
<member name="M:Dilon.Core.Service.Notice.SysNoticeUserService.GetNoticeUserListByNoticeId(System.String)">
<summary>
获取通知公告用户列表
</summary>
<param name="noticeId"></param>
<returns></returns>
</member>
<member name="M:Dilon.Core.Service.Notice.SysNoticeUserService.Read(System.Int64,System.Int64,System.Int32)">
<member name="M:Dilon.Core.Service.Notice.SysNoticeUserService.Read(System.String,System.String,System.Int32)">
<summary>
设置通知公告读取状态
</summary>
@@ -5485,7 +5485,7 @@
<param name="input"></param>
<returns></returns>
</member>
<member name="M:Dilon.Core.Service.SysOrgService.GetDataScopeList(System.Collections.Generic.List{System.Int64})">
<member name="M:Dilon.Core.Service.SysOrgService.GetDataScopeList(System.Collections.Generic.List{System.String})">
<summary>
(非管理员)获取当前用户数据范围（机构Id）
</summary>
@@ -5534,7 +5534,7 @@
<param name="input"></param>
<returns></returns>
</member>
<member name="M:Dilon.Core.Service.SysOrgService.GetChildIdListWithSelfById(System.Int64)">
<member name="M:Dilon.Core.Service.SysOrgService.GetChildIdListWithSelfById(System.String)">
<summary>
根据节点Id获取所有子节点Id集合，包含自己
</summary>
@@ -5547,7 +5547,7 @@
</summary>
<returns></returns>
</member>
<member name="M:Dilon.Core.Service.SysOrgService.GetDataScopeListByDataScopeType(System.Int32,System.Int64)">
<member name="M:Dilon.Core.Service.SysOrgService.GetDataScopeListByDataScopeType(System.Int32,System.String)">
<summary>
根据数据范围类型获取当前用户的数据范围（机构Id）集合
</summary>
@@ -5754,21 +5754,21 @@
<param name="input"></param>
<returns></returns>
</member>
<member name="M:Dilon.Core.Service.SysRoleDataScopeService.GetRoleDataScopeIdList(System.Collections.Generic.List{System.Int64})">
<member name="M:Dilon.Core.Service.SysRoleDataScopeService.GetRoleDataScopeIdList(System.Collections.Generic.List{System.String})">
<summary>
根据角色Id集合获取角色数据范围集合
</summary>
<param name="roleIdList"></param>
<returns></returns>
</member>
<member name="M:Dilon.Core.Service.SysRoleDataScopeService.DeleteRoleDataScopeListByOrgIdList(System.Collections.Generic.List{System.Int64})">
<member name="M:Dilon.Core.Service.SysRoleDataScopeService.DeleteRoleDataScopeListByOrgIdList(System.Collections.Generic.List{System.String})">
<summary>
根据机构Id集合删除对应的角色-数据范围关联信息
</summary>
<param name="orgIdList"></param>
<returns></returns>
</member>
<member name="M:Dilon.Core.Service.SysRoleDataScopeService.DeleteRoleDataScopeListByRoleId(System.Int64)">
<member name="M:Dilon.Core.Service.SysRoleDataScopeService.DeleteRoleDataScopeListByRoleId(System.String)">
<summary>
根据角色Id删除对应的角色-数据范围关联信息
</summary>
@@ -5780,7 +5780,7 @@
角色菜单
</summary>
</member>
<member name="M:Dilon.Core.Service.SysRoleMenuService.GetRoleMenuIdList(System.Collections.Generic.List{System.Int64})">
<member name="M:Dilon.Core.Service.SysRoleMenuService.GetRoleMenuIdList(System.Collections.Generic.List{System.String})">
<summary>
获取角色的菜单Id集合
</summary>
@@ -5794,14 +5794,14 @@
<param name="input"></param>
<returns></returns>
</member>
<member name="M:Dilon.Core.Service.SysRoleMenuService.DeleteRoleMenuListByMenuIdList(System.Collections.Generic.List{System.Int64})">
<member name="M:Dilon.Core.Service.SysRoleMenuService.DeleteRoleMenuListByMenuIdList(System.Collections.Generic.List{System.String})">
<summary>
根据菜单Id集合删除对应的角色-菜单表信息
</summary>
<param name="menuIdList"></param>
<returns></returns>
</member>
<member name="M:Dilon.Core.Service.SysRoleMenuService.DeleteRoleMenuListByRoleId(System.Int64)">
<member name="M:Dilon.Core.Service.SysRoleMenuService.DeleteRoleMenuListByRoleId(System.String)">
<summary>
根据角色Id删除对应的角色-菜单表关联信息
</summary>
@@ -5813,7 +5813,7 @@
角色服务
</summary>
</member>
<member name="M:Dilon.Core.Service.SysRoleService.GetUserRoleList(System.Int64)">
<member name="M:Dilon.Core.Service.SysRoleService.GetUserRoleList(System.String)">
<summary>
获取用户角色相关信息（登录）
</summary>
@@ -5882,7 +5882,7 @@
<param name="input"></param>
<returns></returns>
</member>
<member name="M:Dilon.Core.Service.SysRoleService.GetUserDataScopeIdList(System.Collections.Generic.List{System.Int64},System.Int64)">
<member name="M:Dilon.Core.Service.SysRoleService.GetUserDataScopeIdList(System.Collections.Generic.List{System.String},System.String)">
<summary>
根据角色Id集合获取数据范围Id集合
</summary>
@@ -5890,7 +5890,7 @@
<param name="orgId"></param>
<returns></returns>
</member>
<member name="M:Dilon.Core.Service.SysRoleService.GetNameByRoleId(System.Int64)">
<member name="M:Dilon.Core.Service.SysRoleService.GetNameByRoleId(System.String)">
<summary>
根据角色Id获取角色名称
</summary>
@@ -6632,21 +6632,21 @@
<param name="input"></param>
<returns></returns>
</member>
<member name="M:Dilon.Core.Service.SysUserDataScopeService.GetUserDataScopeIdList(System.Int64)">
<member name="M:Dilon.Core.Service.SysUserDataScopeService.GetUserDataScopeIdList(System.String)">
<summary>
获取用户的数据范围Id集合
</summary>
<param name="userId"></param>
<returns></returns>
</member>
<member name="M:Dilon.Core.Service.SysUserDataScopeService.DeleteUserDataScopeListByOrgIdList(System.Collections.Generic.List{System.Int64})">
<member name="M:Dilon.Core.Service.SysUserDataScopeService.DeleteUserDataScopeListByOrgIdList(System.Collections.Generic.List{System.String})">
<summary>
根据机构Id集合删除对应的用户-数据范围关联信息
</summary>
<param name="orgIdList"></param>
<returns></returns>
</member>
<member name="M:Dilon.Core.Service.SysUserDataScopeService.DeleteUserDataScopeListByUserId(System.Int64)">
<member name="M:Dilon.Core.Service.SysUserDataScopeService.DeleteUserDataScopeListByUserId(System.String)">
<summary>
根据用户Id删除对应的用户-数据范围关联信息
</summary>
@@ -6658,7 +6658,7 @@
用户角色服务
</summary>
</member>
<member name="M:Dilon.Core.Service.SysUserRoleService.GetUserRoleIdList(System.Int64)">
<member name="M:Dilon.Core.Service.SysUserRoleService.GetUserRoleIdList(System.String)">
<summary>
获取用户的角色Id集合
</summary>
@@ -6672,7 +6672,7 @@
<param name="input"></param>
<returns></returns>
</member>
<member name="M:Dilon.Core.Service.SysUserRoleService.GetUserRoleDataScopeIdList(System.Int64,System.Int64)">
<member name="M:Dilon.Core.Service.SysUserRoleService.GetUserRoleDataScopeIdList(System.String,System.String)">
<summary>
获取用户所有角色的数据范围（组织机构Id集合）
</summary>
@@ -6680,14 +6680,14 @@
<param name="orgId"></param>
<returns></returns>
</member>
<member name="M:Dilon.Core.Service.SysUserRoleService.DeleteUserRoleListByRoleId(System.Int64)">
<member name="M:Dilon.Core.Service.SysUserRoleService.DeleteUserRoleListByRoleId(System.String)">
<summary>
根据角色Id删除对应的用户-角色表关联信息
</summary>
<param name="roleId"></param>
<returns></returns>
</member>
<member name="M:Dilon.Core.Service.SysUserRoleService.DeleteUserRoleListByUserId(System.Int64)">
<member name="M:Dilon.Core.Service.SysUserRoleService.DeleteUserRoleListByUserId(System.String)">
<summary>
根据用户Id删除对应的用户-角色表关联信息
</summary>
@@ -6811,7 +6811,7 @@
<param name="input"></param>
<returns></returns>
</member>
<member name="M:Dilon.Core.Service.SysUserService.GetUserById(System.Int64)">
<member name="M:Dilon.Core.Service.SysUserService.GetUserById(System.String)">
<summary>
根据用户Id获取用户
</summary>
@@ -6826,7 +6826,7 @@
<param name="sysUser"></param>
<returns></returns>
</member>
<member name="M:Dilon.Core.Service.SysUserService.GetUserDataScopeIdList(System.Int64)">
<member name="M:Dilon.Core.Service.SysUserService.GetUserDataScopeIdList(System.String)">
<summary>
获取用户数据范围（机构Id集合）并缓存
</summary>

6
Api/Dilon.EntityFramework.Core/DbContexts/DefaultDbContext.cs
View File

@@ -112,18 +112,18 @@ namespace Dilon.EntityFramework.Core
var obj = entity.Entity as DEntityBase;
if (entity.State == EntityState.Added)
{
obj.Id = IDGenerator.NextId();
obj.Id = Guid.NewGuid().ToString();
obj.CreatedTime = DateTimeOffset.Now;
if (!string.IsNullOrEmpty(userId))
{
obj.CreatedUserId = long.Parse(userId);
obj.CreatedUserId = userId;
obj.CreatedUserName = userName;
}
}
else if (entity.State == EntityState.Modified)
{
obj.UpdatedTime = DateTimeOffset.Now;
obj.UpdatedUserId = long.Parse(userId);
obj.UpdatedUserId = userId;
obj.UpdatedUserName = userName;
}
}

6
Api/Dilon.EntityFramework.Core/DbContexts/MultiTenantDbContext.cs
View File

@@ -46,18 +46,18 @@ namespace Dilon.EntityFramework.Core
var obj = entity.Entity as DEntityBase;
if (entity.State == EntityState.Added)
{
obj.Id = IDGenerator.NextId();
obj.Id = Guid.NewGuid().ToString();
obj.CreatedTime = DateTimeOffset.Now;
if (!string.IsNullOrEmpty(userId))
{
obj.CreatedUserId = long.Parse(userId);
obj.CreatedUserId = userId;
obj.CreatedUserName = userName;
}
}
else if (entity.State == EntityState.Modified)
{
obj.UpdatedTime = DateTimeOffset.Now;
obj.UpdatedUserId = long.Parse(userId);
obj.UpdatedUserId = userId;
obj.UpdatedUserName = userName;
}
}