@@ -31,6 +31,7 @@ namespace IRaCIS.Core.Application.Service
|
||||
IRepository<TrialIdentityUser> _trialIdentityUserRepository,
|
||||
IRepository<Trial> _trialRepository,
|
||||
IRepository<UserType> _userTypeRepository,
|
||||
IRepository<UserLog> _userLogRepository,
|
||||
IMailVerificationService _mailVerificationService,
|
||||
IDistributedLockProvider _distributedLockProvider, IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer) : BaseService, ITrialExternalUserService
|
||||
{
|
||||
@@ -215,8 +216,13 @@ namespace IRaCIS.Core.Application.Service
|
||||
|
||||
//var identityUserId = item.Key;
|
||||
|
||||
|
||||
|
||||
var existSysUser = await _identityUserRepository.Where(t => t.EMail == userEmail, true).Include(t => t.UserRoleList).FirstOrDefaultAsync();
|
||||
|
||||
//需要创建新的账户
|
||||
var isNeedCreateNewUser = existSysUser == null;
|
||||
|
||||
if (existSysUser != null)
|
||||
{
|
||||
|
||||
@@ -294,7 +300,7 @@ namespace IRaCIS.Core.Application.Service
|
||||
|
||||
var newAddUser = await _identityUserRepository.AddAsync(generateUser);
|
||||
|
||||
|
||||
|
||||
|
||||
existSysUser = newAddUser;
|
||||
|
||||
@@ -390,6 +396,12 @@ namespace IRaCIS.Core.Application.Service
|
||||
|
||||
await _trialExternalUseRepository.BatchUpdateNoTrackingAsync(t => externalIdList.Contains(t.Id), u => new TrialExternalUser() { IsJoin = true });
|
||||
|
||||
//创建账号 和创建角色 一条,更新的时候才记录更新角色
|
||||
if (isNeedCreateNewUser == false)
|
||||
{
|
||||
await _userLogRepository.AddAsync(new UserLog() { IP = _userInfo.IP, ActionIdentityUserId = _userInfo.IdentityUserId, ActionUserName = _userInfo.UserName, TargetIdentityUserId = identityUserId, OptType = UserOptType.UpdateUserRole }, true);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user