This commit is contained in:
@@ -8,7 +8,7 @@
|
||||
/// <summary>
|
||||
/// 附属机构id
|
||||
/// </summary>
|
||||
public long OrgId { get; set; }
|
||||
public string OrgId { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 附属机构编码
|
||||
@@ -23,7 +23,7 @@
|
||||
/// <summary>
|
||||
/// 附属职位id
|
||||
/// </summary>
|
||||
public long PosId { get; set; }
|
||||
public string PosId { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 附属职位编码
|
||||
|
||||
@@ -35,6 +35,6 @@ namespace Dilon.Core.Service
|
||||
/// <summary>
|
||||
/// 职位集合
|
||||
/// </summary>
|
||||
public List<long> PosIdList { get; set; } = new List<long>();
|
||||
public List<string> PosIdList { get; set; } = new List<string>();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
/// <summary>
|
||||
/// 职位Id
|
||||
/// </summary>
|
||||
public long PosId { get; set; }
|
||||
public string PosId { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 职位编码
|
||||
|
||||
@@ -5,9 +5,9 @@ namespace Dilon.Core.Service
|
||||
{
|
||||
public interface ISysEmpPosService
|
||||
{
|
||||
Task AddOrUpdate(long empId, List<long> posIdList);
|
||||
Task DeleteEmpPosInfoByUserId(long empId);
|
||||
Task<List<EmpPosOutput>> GetEmpPosList(long empId);
|
||||
Task<bool> HasPosEmp(long posId);
|
||||
Task AddOrUpdate(string empId, List<string> posIdList);
|
||||
Task DeleteEmpPosInfoByUserId(string empId);
|
||||
Task<List<EmpPosOutput>> GetEmpPosList(string empId);
|
||||
Task<bool> HasPosEmp(string posId);
|
||||
}
|
||||
}
|
||||
@@ -25,7 +25,7 @@ namespace Dilon.Core.Service
|
||||
/// </summary>
|
||||
/// <returns></returns>
|
||||
[UnitOfWork]
|
||||
public async Task AddOrUpdate(long empId, List<EmpExtOrgPosOutput> extIdList)
|
||||
public async Task AddOrUpdate(string empId, List<EmpExtOrgPosOutput> extIdList)
|
||||
{
|
||||
// 先删除
|
||||
await DeleteEmpExtInfoByUserId(empId);
|
||||
@@ -48,7 +48,7 @@ namespace Dilon.Core.Service
|
||||
/// </summary>
|
||||
/// <param name="empId"></param>
|
||||
/// <returns></returns>
|
||||
public async Task<List<EmpExtOrgPosOutput>> GetEmpExtOrgPosList(long empId)
|
||||
public async Task<List<EmpExtOrgPosOutput>> GetEmpExtOrgPosList(string empId)
|
||||
{
|
||||
return await _sysEmpExtOrgPosRep.DetachedEntities
|
||||
.Where(u => u.SysEmpId == empId)
|
||||
@@ -68,7 +68,7 @@ namespace Dilon.Core.Service
|
||||
/// </summary>
|
||||
/// <param name="orgId"></param>
|
||||
/// <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);
|
||||
}
|
||||
@@ -78,7 +78,7 @@ namespace Dilon.Core.Service
|
||||
/// </summary>
|
||||
/// <param name="posId"></param>
|
||||
/// <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);
|
||||
}
|
||||
@@ -88,7 +88,7 @@ namespace Dilon.Core.Service
|
||||
/// </summary>
|
||||
/// <param name="empId"></param>
|
||||
/// <returns></returns>
|
||||
public async Task DeleteEmpExtInfoByUserId(long empId)
|
||||
public async Task DeleteEmpExtInfoByUserId(string empId)
|
||||
{
|
||||
var empExtOrgPos = await _sysEmpExtOrgPosRep.Where(u => u.SysEmpId == empId).ToListAsync();
|
||||
empExtOrgPos.ForEach(u =>
|
||||
|
||||
@@ -27,7 +27,7 @@ namespace Dilon.Core.Service
|
||||
/// <param name="posIdList">职位id集合</param>
|
||||
/// <returns></returns>
|
||||
[UnitOfWork]
|
||||
public async Task AddOrUpdate(long empId, List<long> posIdList)
|
||||
public async Task AddOrUpdate(string empId, List<string> posIdList)
|
||||
{
|
||||
// 先删除
|
||||
await DeleteEmpPosInfoByUserId(empId);
|
||||
@@ -46,7 +46,7 @@ namespace Dilon.Core.Service
|
||||
/// 获取所属职位信息
|
||||
/// </summary>
|
||||
/// <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
|
||||
.Where(u => u.SysEmpId == empId)
|
||||
@@ -63,7 +63,7 @@ namespace Dilon.Core.Service
|
||||
/// </summary>
|
||||
/// <param name="posId"></param>
|
||||
/// <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);
|
||||
}
|
||||
@@ -73,7 +73,7 @@ namespace Dilon.Core.Service
|
||||
/// </summary>
|
||||
/// <param name="empId"></param>
|
||||
/// <returns></returns>
|
||||
public async Task DeleteEmpPosInfoByUserId(long empId)
|
||||
public async Task DeleteEmpPosInfoByUserId(string empId)
|
||||
{
|
||||
var empPos = await _sysEmpPosRep.Where(u => u.SysEmpId == empId).ToListAsync();
|
||||
empPos.ForEach(u =>
|
||||
|
||||
@@ -31,7 +31,7 @@ namespace Dilon.Core.Service
|
||||
/// </summary>
|
||||
/// <param name="empId"></param>
|
||||
/// <returns></returns>
|
||||
public async Task<EmpOutput> GetEmpInfo(long empId)
|
||||
public async Task<EmpOutput> GetEmpInfo(string empId)
|
||||
{
|
||||
var empInfoOutput = new EmpOutput();
|
||||
var sysEmp = await _sysEmpRep.FirstOrDefaultAsync(u => u.Id == empId, false);
|
||||
@@ -51,7 +51,7 @@ namespace Dilon.Core.Service
|
||||
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 =>
|
||||
{
|
||||
u.DeleteNow();
|
||||
@@ -74,7 +74,7 @@ namespace Dilon.Core.Service
|
||||
/// <param name="orgId"></param>
|
||||
/// <param name="orgName"></param>
|
||||
/// <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();
|
||||
emps.ForEach(u =>
|
||||
@@ -88,7 +88,7 @@ namespace Dilon.Core.Service
|
||||
/// </summary>
|
||||
/// <param name="orgId"></param>
|
||||
/// <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);
|
||||
}
|
||||
@@ -99,7 +99,7 @@ namespace Dilon.Core.Service
|
||||
/// <param name="empId"></param>
|
||||
/// <returns></returns>
|
||||
[UnitOfWork]
|
||||
public async Task DeleteEmpInfoByUserId(long empId)
|
||||
public async Task DeleteEmpInfoByUserId(string empId)
|
||||
{
|
||||
// 删除员工信息
|
||||
var emp = await _sysEmpRep.FirstOrDefaultAsync(u => u.Id == empId);
|
||||
@@ -117,7 +117,7 @@ namespace Dilon.Core.Service
|
||||
/// </summary>
|
||||
/// <param name="empId"></param>
|
||||
/// <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;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user