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 10:40:07 +00:00
parent c2ed43238b
commit bd18dd95b7
9 changed files with 32 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Api/Dilon.Core/Manager/UserManager.cs
View File

@@ -15,9 +15,9 @@ namespace Dilon.Core
private readonly IRepository<SysEmp> _sysEmpRep; // 员工表 private readonly IRepository<SysEmp> _sysEmpRep; // 员工表
private readonly IHttpContextAccessor _httpContextAccessor; private readonly IHttpContextAccessor _httpContextAccessor;
public long UserId public string UserId
{ {
get => long.Parse(_httpContextAccessor.HttpContext.User.FindFirst(ClaimConst.CLAINM_USERID)?.Value); get => _httpContextAccessor.HttpContext.User.FindFirst(ClaimConst.CLAINM_USERID)?.Value;
} }
public string Account public string Account

14
Api/Dilon.Core/Service/Cache/SysCacheService.cs
View File

@@ -30,10 +30,10 @@ namespace Dilon.Core.Service
/// </summary> /// </summary>
/// <param name="userId"></param> /// <param name="userId"></param>
/// <returns></returns> /// <returns></returns>
public async Task<List<long>> GetDataScope(long userId) public async Task<List<string>> GetDataScope(string userId)
{ {
var cacheKey = CommonConst.CACHE_KEY_DATASCOPE + $"{userId}"; var cacheKey = CommonConst.CACHE_KEY_DATASCOPE + $"{userId}";
return await _cache.GetAsync<List<long>>(cacheKey); return await _cache.GetAsync<List<string>>(cacheKey);
} }
/// <summary> /// <summary>
@@ -43,7 +43,7 @@ namespace Dilon.Core.Service
/// <param name="dataScopes"></param> /// <param name="dataScopes"></param>
/// <returns></returns> /// <returns></returns>
[NonAction] [NonAction]
public async Task SetDataScope(long userId, List<long> dataScopes) public async Task SetDataScope(string userId, List<string> dataScopes)
{ {
var cacheKey = CommonConst.CACHE_KEY_DATASCOPE + $"{userId}"; var cacheKey = CommonConst.CACHE_KEY_DATASCOPE + $"{userId}";
await _cache.SetAsync(cacheKey, dataScopes); await _cache.SetAsync(cacheKey, dataScopes);
@@ -55,7 +55,7 @@ namespace Dilon.Core.Service
/// <param name="userId"></param> /// <param name="userId"></param>
/// <param name="appCode"></param> /// <param name="appCode"></param>
/// <returns></returns> /// <returns></returns>
public async Task<List<AntDesignTreeNode>> GetMenu(long userId, string appCode) public async Task<List<AntDesignTreeNode>> GetMenu(string userId, string appCode)
{ {
var cacheKey = CommonConst.CACHE_KEY_MENU + $"{userId}-{appCode}"; var cacheKey = CommonConst.CACHE_KEY_MENU + $"{userId}-{appCode}";
return await _cache.GetAsync<List<AntDesignTreeNode>>(cacheKey); return await _cache.GetAsync<List<AntDesignTreeNode>>(cacheKey);
@@ -69,7 +69,7 @@ namespace Dilon.Core.Service
/// <param name="menus"></param> /// <param name="menus"></param>
/// <returns></returns> /// <returns></returns>
[NonAction] [NonAction]
public async Task SetMenu(long userId, string appCode, List<AntDesignTreeNode> menus) public async Task SetMenu(string userId, string appCode, List<AntDesignTreeNode> menus)
{ {
var cacheKey = CommonConst.CACHE_KEY_MENU + $"{userId}-{appCode}"; var cacheKey = CommonConst.CACHE_KEY_MENU + $"{userId}-{appCode}";
await _cache.SetAsync(cacheKey, menus); await _cache.SetAsync(cacheKey, menus);
@@ -80,7 +80,7 @@ namespace Dilon.Core.Service
/// </summary> /// </summary>
/// <param name="userId"></param> /// <param name="userId"></param>
/// <returns></returns> /// <returns></returns>
public async Task<List<string>> GetPermission(long userId) public async Task<List<string>> GetPermission(string userId)
{ {
var cacheKey = CommonConst.CACHE_KEY_PERMISSION + $"{userId}"; var cacheKey = CommonConst.CACHE_KEY_PERMISSION + $"{userId}";
return await _cache.GetAsync<List<string>>(cacheKey); return await _cache.GetAsync<List<string>>(cacheKey);
@@ -93,7 +93,7 @@ namespace Dilon.Core.Service
/// <param name="permissions"></param> /// <param name="permissions"></param>
/// <returns></returns> /// <returns></returns>
[NonAction] [NonAction]
public async Task SetPermission(long userId, List<string> permissions) public async Task SetPermission(string userId, List<string> permissions)
{ {
var cacheKey = CommonConst.CACHE_KEY_PERMISSION + $"{userId}"; var cacheKey = CommonConst.CACHE_KEY_PERMISSION + $"{userId}";
await _cache.SetAsync(cacheKey, permissions); await _cache.SetAsync(cacheKey, permissions);

4
Api/Dilon.Core/Service/Emp/Dto/EmpExtOrgPosOutput.cs
View File

@@ -8,7 +8,7 @@
/// <summary> /// <summary>
/// 附属机构id /// 附属机构id
/// </summary> /// </summary>
public long OrgId { get; set; } public string OrgId { get; set; }
/// <summary> /// <summary>
/// 附属机构编码 /// 附属机构编码
@@ -23,7 +23,7 @@
/// <summary> /// <summary>
/// 附属职位id /// 附属职位id
/// </summary> /// </summary>
public long PosId { get; set; } public string PosId { get; set; }
/// <summary> /// <summary>
/// 附属职位编码 /// 附属职位编码

2
Api/Dilon.Core/Service/Emp/Dto/EmpOutput2.cs
View File

@@ -35,6 +35,6 @@ namespace Dilon.Core.Service
/// <summary> /// <summary>
/// 职位集合 /// 职位集合
/// </summary> /// </summary>
public List<long> PosIdList { get; set; } = new List<long>(); public List<string> PosIdList { get; set; } = new List<string>();
} }
} }

2
Api/Dilon.Core/Service/Emp/Dto/EmpPosOutput.cs
View File

@@ -8,7 +8,7 @@
/// <summary> /// <summary>
/// 职位Id /// 职位Id
/// </summary> /// </summary>
public long PosId { get; set; } public string PosId { get; set; }
/// <summary> /// <summary>
/// 职位编码 /// 职位编码

8
Api/Dilon.Core/Service/Emp/ISysEmpPosService.cs
View File

@@ -5,9 +5,9 @@ namespace Dilon.Core.Service
{ {
public interface ISysEmpPosService public interface ISysEmpPosService
{ {
Task AddOrUpdate(long empId, List<long> posIdList); Task AddOrUpdate(string empId, List<string> posIdList);
Task DeleteEmpPosInfoByUserId(long empId); Task DeleteEmpPosInfoByUserId(string empId);
Task<List<EmpPosOutput>> GetEmpPosList(long empId); Task<List<EmpPosOutput>> GetEmpPosList(string empId);
Task<bool> HasPosEmp(long posId); Task<bool> HasPosEmp(string posId);
} }
} }

10
Api/Dilon.Core/Service/Emp/SysEmpExtOrgPosService.cs
View File

@@ -25,7 +25,7 @@ namespace Dilon.Core.Service
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
[UnitOfWork] [UnitOfWork]
public async Task AddOrUpdate(long empId, List<EmpExtOrgPosOutput> extIdList) public async Task AddOrUpdate(string empId, List<EmpExtOrgPosOutput> extIdList)
{ {
// 先删除 // 先删除
await DeleteEmpExtInfoByUserId(empId); await DeleteEmpExtInfoByUserId(empId);
@@ -48,7 +48,7 @@ namespace Dilon.Core.Service
/// </summary> /// </summary>
/// <param name="empId"></param> /// <param name="empId"></param>
/// <returns></returns> /// <returns></returns>
public async Task<List<EmpExtOrgPosOutput>> GetEmpExtOrgPosList(long empId) public async Task<List<EmpExtOrgPosOutput>> GetEmpExtOrgPosList(string empId)
{ {
return await _sysEmpExtOrgPosRep.DetachedEntities return await _sysEmpExtOrgPosRep.DetachedEntities
.Where(u => u.SysEmpId == empId) .Where(u => u.SysEmpId == empId)
@@ -68,7 +68,7 @@ namespace Dilon.Core.Service
/// </summary> /// </summary>
/// <param name="orgId"></param> /// <param name="orgId"></param>
/// <returns></returns> /// <returns></returns>
public async Task<bool> HasExtOrgEmp(long orgId) public async Task<bool> HasExtOrgEmp(string orgId)
{ {
return await _sysEmpExtOrgPosRep.DetachedEntities.AnyAsync(u => u.SysOrgId == orgId); return await _sysEmpExtOrgPosRep.DetachedEntities.AnyAsync(u => u.SysOrgId == orgId);
} }
@@ -78,7 +78,7 @@ namespace Dilon.Core.Service
/// </summary> /// </summary>
/// <param name="posId"></param> /// <param name="posId"></param>
/// <returns></returns> /// <returns></returns>
public async Task<bool> HasExtPosEmp(long posId) public async Task<bool> HasExtPosEmp(string posId)
{ {
return await _sysEmpExtOrgPosRep.DetachedEntities.AnyAsync(u => u.SysPosId == posId); return await _sysEmpExtOrgPosRep.DetachedEntities.AnyAsync(u => u.SysPosId == posId);
} }
@@ -88,7 +88,7 @@ namespace Dilon.Core.Service
/// </summary> /// </summary>
/// <param name="empId"></param> /// <param name="empId"></param>
/// <returns></returns> /// <returns></returns>
public async Task DeleteEmpExtInfoByUserId(long empId) public async Task DeleteEmpExtInfoByUserId(string empId)
{ {
var empExtOrgPos = await _sysEmpExtOrgPosRep.Where(u => u.SysEmpId == empId).ToListAsync(); var empExtOrgPos = await _sysEmpExtOrgPosRep.Where(u => u.SysEmpId == empId).ToListAsync();
empExtOrgPos.ForEach(u => empExtOrgPos.ForEach(u =>

8
Api/Dilon.Core/Service/Emp/SysEmpPosService.cs
View File

@@ -27,7 +27,7 @@ namespace Dilon.Core.Service
/// <param name="posIdList">职位id集合</param> /// <param name="posIdList">职位id集合</param>
/// <returns></returns> /// <returns></returns>
[UnitOfWork] [UnitOfWork]
public async Task AddOrUpdate(long empId, List<long> posIdList) public async Task AddOrUpdate(string empId, List<string> posIdList)
{ {
// 先删除 // 先删除
await DeleteEmpPosInfoByUserId(empId); await DeleteEmpPosInfoByUserId(empId);
@@ -46,7 +46,7 @@ namespace Dilon.Core.Service
/// 获取所属职位信息 /// 获取所属职位信息
/// </summary> /// </summary>
/// <param name="empId">员工Id（用户Id）</param> /// <param name="empId">员工Id（用户Id）</param>
public async Task<List<EmpPosOutput>> GetEmpPosList(long empId) public async Task<List<EmpPosOutput>> GetEmpPosList(string empId)
{ {
return await _sysEmpPosRep.DetachedEntities return await _sysEmpPosRep.DetachedEntities
.Where(u => u.SysEmpId == empId) .Where(u => u.SysEmpId == empId)
@@ -63,7 +63,7 @@ namespace Dilon.Core.Service
/// </summary> /// </summary>
/// <param name="posId"></param> /// <param name="posId"></param>
/// <returns></returns> /// <returns></returns>
public async Task<bool> HasPosEmp(long posId) public async Task<bool> HasPosEmp(string posId)
{ {
return await _sysEmpPosRep.DetachedEntities.AnyAsync(u => u.SysPosId == posId); return await _sysEmpPosRep.DetachedEntities.AnyAsync(u => u.SysPosId == posId);
} }
@@ -73,7 +73,7 @@ namespace Dilon.Core.Service
/// </summary> /// </summary>
/// <param name="empId"></param> /// <param name="empId"></param>
/// <returns></returns> /// <returns></returns>
public async Task DeleteEmpPosInfoByUserId(long empId) public async Task DeleteEmpPosInfoByUserId(string empId)
{ {
var empPos = await _sysEmpPosRep.Where(u => u.SysEmpId == empId).ToListAsync(); var empPos = await _sysEmpPosRep.Where(u => u.SysEmpId == empId).ToListAsync();
empPos.ForEach(u => empPos.ForEach(u =>

12
Api/Dilon.Core/Service/Emp/SysEmpService.cs
View File

@@ -31,7 +31,7 @@ namespace Dilon.Core.Service
/// </summary> /// </summary>
/// <param name="empId"></param> /// <param name="empId"></param>
/// <returns></returns> /// <returns></returns>
public async Task<EmpOutput> GetEmpInfo(long empId) public async Task<EmpOutput> GetEmpInfo(string empId)
{ {
var empInfoOutput = new EmpOutput(); var empInfoOutput = new EmpOutput();
var sysEmp = await _sysEmpRep.FirstOrDefaultAsync(u => u.Id == empId, false); var sysEmp = await _sysEmpRep.FirstOrDefaultAsync(u => u.Id == empId, false);
@@ -51,7 +51,7 @@ namespace Dilon.Core.Service
public async Task AddOrUpdate(EmpOutput2 sysEmpParam) public async Task AddOrUpdate(EmpOutput2 sysEmpParam)
{ {
// 先删除员工信息 // 先删除员工信息
var emps = await _sysEmpRep.Where(u => u.Id == long.Parse(sysEmpParam.Id)).ToListAsync(); var emps = await _sysEmpRep.Where(u => u.Id == sysEmpParam.Id).ToListAsync();
emps.ForEach(u => emps.ForEach(u =>
{ {
u.DeleteNow(); u.DeleteNow();
@@ -74,7 +74,7 @@ namespace Dilon.Core.Service
/// <param name="orgId"></param> /// <param name="orgId"></param>
/// <param name="orgName"></param> /// <param name="orgName"></param>
/// <returns></returns> /// <returns></returns>
public async Task UpdateEmpOrgInfo(long orgId, string orgName) public async Task UpdateEmpOrgInfo(string orgId, string orgName)
{ {
var emps = await _sysEmpRep.Where(u => u.OrgId == orgId).ToListAsync(); var emps = await _sysEmpRep.Where(u => u.OrgId == orgId).ToListAsync();
emps.ForEach(u => emps.ForEach(u =>
@@ -88,7 +88,7 @@ namespace Dilon.Core.Service
/// </summary> /// </summary>
/// <param name="orgId"></param> /// <param name="orgId"></param>
/// <returns></returns> /// <returns></returns>
public async Task<bool> HasOrgEmp(long orgId) public async Task<bool> HasOrgEmp(string orgId)
{ {
return await _sysEmpRep.DetachedEntities.AnyAsync(u => u.OrgId == orgId); return await _sysEmpRep.DetachedEntities.AnyAsync(u => u.OrgId == orgId);
} }
@@ -99,7 +99,7 @@ namespace Dilon.Core.Service
/// <param name="empId"></param> /// <param name="empId"></param>
/// <returns></returns> /// <returns></returns>
[UnitOfWork] [UnitOfWork]
public async Task DeleteEmpInfoByUserId(long empId) public async Task DeleteEmpInfoByUserId(string empId)
{ {
// 删除员工信息 // 删除员工信息
var emp = await _sysEmpRep.FirstOrDefaultAsync(u => u.Id == empId); var emp = await _sysEmpRep.FirstOrDefaultAsync(u => u.Id == empId);
@@ -117,7 +117,7 @@ namespace Dilon.Core.Service
/// </summary> /// </summary>
/// <param name="empId"></param> /// <param name="empId"></param>
/// <returns></returns> /// <returns></returns>
public async Task<long> GetEmpOrgId(long empId) public async Task<string> GetEmpOrgId(string empId)
{ {
return (await _sysEmpRep.FirstOrDefaultAsync(u => u.Id == empId, false)).OrgId; return (await _sysEmpRep.FirstOrDefaultAsync(u => u.Id == empId, false)).OrgId;
} }