加人软删除逻辑有问题
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/push Build is passing
Details
parent
1fa94b95f0
commit
25a91904b8
|
@ -938,7 +938,7 @@ namespace IRaCIS.Core.Application.Contracts
|
||||||
var identityUserId = existSysUser.Id;
|
var identityUserId = existSysUser.Id;
|
||||||
|
|
||||||
|
|
||||||
var findTrialUser = await _trialIdentityUserRepository.Where(t => t.TrialId == trialId && t.IdentityUserId == identityUserId, true).Include(t => t.TrialUserRoleList).ThenInclude(t => t.UserRole).FirstOrDefaultAsync();
|
var findTrialUser = await _trialIdentityUserRepository.Where(t => t.TrialId == trialId && t.IdentityUserId == identityUserId, true, true).Include(t => t.TrialUserRoleList).ThenInclude(t => t.UserRole).FirstOrDefaultAsync();
|
||||||
|
|
||||||
|
|
||||||
var isNeedSendEmail = false;
|
var isNeedSendEmail = false;
|
||||||
|
@ -1143,7 +1143,7 @@ namespace IRaCIS.Core.Application.Contracts
|
||||||
var identityUserId = existSysUser.Id;
|
var identityUserId = existSysUser.Id;
|
||||||
|
|
||||||
|
|
||||||
var findTrialUser = await _trialIdentityUserRepository.Where(t => t.TrialId == trialId && t.IdentityUserId == identityUserId, true).Include(t => t.TrialUserRoleList).ThenInclude(t => t.UserRole).FirstOrDefaultAsync();
|
var findTrialUser = await _trialIdentityUserRepository.Where(t => t.TrialId == trialId && t.IdentityUserId == identityUserId, true, true).Include(t => t.TrialUserRoleList).ThenInclude(t => t.UserRole).FirstOrDefaultAsync();
|
||||||
|
|
||||||
|
|
||||||
var isNeedSendEmail = false;
|
var isNeedSendEmail = false;
|
||||||
|
@ -1207,6 +1207,15 @@ namespace IRaCIS.Core.Application.Contracts
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
//加入到Site CRC
|
||||||
|
|
||||||
|
foreach (var site in addUserRoleList)
|
||||||
|
{
|
||||||
|
|
||||||
|
//var findTrialSiteUserRole=_trialSiteUserRoleRepository.Where(t=>t.TrialId==trialId && t.user)
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
if (isNeedSendEmail)
|
if (isNeedSendEmail)
|
||||||
{
|
{
|
||||||
var dbUserType = _userTypeRepository.Where(t => userTypeIdList.Contains(t.Id)).ToList();
|
var dbUserType = _userTypeRepository.Where(t => userTypeIdList.Contains(t.Id)).ToList();
|
||||||
|
|
Loading…
Reference in New Issue