XCKJ
/
irc-netcore-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改冲突
continuous-integration/drone/push Build is passing Details

Uat_IRC_Net8
hang 2025-02-19 10:13:37 +08:00
parent c6c036c152 21626cda9d
commit a49b4c8ef7
1 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
IRaCIS.Core.Application/TestService.cs
View File

@ -168,7 +168,7 @@ namespace IRaCIS.Core.Application.Service
if (_trialUserRoleReposiotry.Any(t => t.TrialUserId == Guid.Empty)) if (_trialUserRoleReposiotry.Any(t => t.TrialUserId == Guid.Empty))
{ {
var list = _trialUserRoleReposiotry.Where(t => t.IsDeleted == true, false, true).Select(t => new { t.TrialId, t.UserRole.IdentityUserId, t.UserId, t.JoinTime, t.RemoveTime, t.DeletedTime, t.DeleteUserId }).ToList(); var list = _trialUserRoleReposiotry.Where(t => t.IsDeleted == true && t.TrialUserId == Guid.Empty, false, true).Select(t => new { t.TrialId, t.UserRole.IdentityUserId, t.UserId, t.JoinTime, t.RemoveTime, t.DeletedTime, t.DeleteUserId, t.CreateUserId }).ToList();
foreach (var item in list.GroupBy(t => new { t.IdentityUserId, t.TrialId })) foreach (var item in list.GroupBy(t => new { t.IdentityUserId, t.TrialId }))
@ -183,19 +183,33 @@ namespace IRaCIS.Core.Application.Service
var first = userRoleList.OrderByDescending(t => t.RemoveTime).FirstOrDefault(); var first = userRoleList.OrderByDescending(t => t.RemoveTime).FirstOrDefault();
await _trialIdentityUserRepository.AddAsync(new TrialIdentityUser() //判断在项目中是否存在
var find = _trialIdentityUserRepository.Where(t => t.IdentityUserId == first.IdentityUserId && t.TrialId == first.TrialId).FirstOrDefault();
if (find == null)
{ {
Id = id, await _trialIdentityUserRepository.AddAsync(new TrialIdentityUser()
IdentityUserId = item.Key.IdentityUserId, {
TrialId = item.Key.TrialId, Id = id,
RemoveTime = first.RemoveTime, IdentityUserId = item.Key.IdentityUserId,
IsDeleted = true, TrialId = item.Key.TrialId,
DeletedTime = first.DeletedTime, RemoveTime = first.RemoveTime,
DeleteUserId = first.DeleteUserId, IsDeleted = true,
}); DeletedTime = first.DeletedTime,
DeleteUserId = first.DeleteUserId,
});
await _trialUserRoleReposiotry.BatchUpdateNoTrackingAsync(t => t.TrialId == item.Key.TrialId && userIdList.Contains(t.UserId), u => new TrialUserRole() { TrialUserId = id, UpdateTime = (DateTime)first.DeletedTime });
}
else
{
await _trialUserRoleReposiotry.BatchUpdateNoTrackingAsync(t => t.TrialId == item.Key.TrialId && userIdList.Contains(t.UserId), u => new TrialUserRole() { TrialUserId = find.Id, UpdateTime = (DateTime)first.DeletedTime });
}
await _trialUserRoleReposiotry.BatchUpdateNoTrackingAsync(t => t.TrialId == item.Key.TrialId && userIdList.Contains(t.UserId), u => new TrialUserRole() { TrialUserId = id });
} }