修改内部人员退出
parent
28a56ee298
commit
e0ee9abd61
|
@ -184,7 +184,7 @@ namespace IRaCIS.Core.Application.Service
|
||||||
|
|
||||||
var first = currentUserRoleList.FirstOrDefault();
|
var first = currentUserRoleList.FirstOrDefault();
|
||||||
|
|
||||||
var findTrialuser = await _trialIdentityUserRepository.Where(t => t.TrialId == first.TrialId && t.IdentityUserId == item.Key, true).Include(t => t.TrialUserRoleList).FirstOrDefaultAsync();
|
var findTrialuser = await _trialIdentityUserRepository.Where(t => t.TrialId == first.TrialId && t.IdentityUserId == item.Key, true, true).Include(t => t.TrialUserRoleList).FirstOrDefaultAsync();
|
||||||
|
|
||||||
if (findTrialuser == null)
|
if (findTrialuser == null)
|
||||||
{
|
{
|
||||||
|
@ -201,6 +201,13 @@ namespace IRaCIS.Core.Application.Service
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
if (findTrialuser.IsDeleted = true)
|
||||||
|
{
|
||||||
|
findTrialuser.IsDeleted = false;
|
||||||
|
findTrialuser.JoinTime = DateTime.Now;
|
||||||
|
findTrialuser.RemoveTime = null;
|
||||||
|
}
|
||||||
|
|
||||||
findTrialuser.TrialUserRoleList.AddRange(currentUserRoleList.Select(t => new TrialUserRole() { UserId = t.UserId, TrialId = t.TrialId, TrialUserId = findTrialuser.Id }).ToList());
|
findTrialuser.TrialUserRoleList.AddRange(currentUserRoleList.Select(t => new TrialUserRole() { UserId = t.UserId, TrialId = t.TrialId, TrialUserId = findTrialuser.Id }).ToList());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue