修改外部人员邀请邮件以及添加账号
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/push Build is passing
Details
parent
ecdd0fda85
commit
ba2965e295
|
@ -325,10 +325,11 @@ namespace IRaCIS.Core.Application.Service
|
||||||
IdentityUserId = identityUserId,
|
IdentityUserId = identityUserId,
|
||||||
TrialId = trialId,
|
TrialId = trialId,
|
||||||
JoinTime = DateTime.Now,
|
JoinTime = DateTime.Now,
|
||||||
|
|
||||||
TrialUserRoleList = userTypeIdList.Select(u => new TrialUserRole()
|
TrialUserRoleList = userTypeIdList.Select(u => new TrialUserRole()
|
||||||
{
|
{
|
||||||
TrialId = trialId,
|
TrialId = trialId,
|
||||||
UserId = u,
|
UserId = existSysUser.UserRoleList.FirstOrDefault(t=>t.UserTypeId==u).Id,
|
||||||
|
|
||||||
}).ToList()
|
}).ToList()
|
||||||
});
|
});
|
||||||
|
@ -346,7 +347,7 @@ namespace IRaCIS.Core.Application.Service
|
||||||
if (findTrialUserRole == null)
|
if (findTrialUserRole == null)
|
||||||
{
|
{
|
||||||
//添加该角色
|
//添加该角色
|
||||||
findTrialUser.TrialUserRoleList.Add(new TrialUserRole() { TrialUserId = findTrialUser.Id, TrialId = trialId, UserId = userTypeId });
|
findTrialUser.TrialUserRoleList.Add(new TrialUserRole() { TrialUserId = findTrialUser.Id, TrialId = trialId, UserId = existSysUser.UserRoleList.FirstOrDefault(t => t.UserTypeId == userTypeId).Id });
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
@ -361,8 +362,9 @@ namespace IRaCIS.Core.Application.Service
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
await _trialIdentityUserRepository.SaveChangesAsync();
|
||||||
|
|
||||||
var usertyps = string.Join(',', userTypeList.Select(t => t.UserTypeShortName));
|
var usertyps = string.Join(',', userTypeList.Where(t=> userTypeIdList.Contains(t.UserTypeId)).Select(t => t.UserTypeShortName));
|
||||||
|
|
||||||
await _mailVerificationService.ExternalUserJoinEmail(trialId, identityUserId, usertyps, sendEmail.BaseUrl, sendEmail.RouteUrl);
|
await _mailVerificationService.ExternalUserJoinEmail(trialId, identityUserId, usertyps, sendEmail.BaseUrl, sendEmail.RouteUrl);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue