@@ -928,7 +928,7 @@ namespace IRaCIS.Core.Application.Service
|
||||
.WhereIf(inQuery.OptType != null, t => t.OptType == inQuery.OptType)
|
||||
.WhereIf(inQuery.BeginDate != null, t => t.CreateTime >= inQuery.BeginDate)
|
||||
.WhereIf(inQuery.EndDate != null, t => t.CreateTime <= inQuery.EndDate)
|
||||
.WhereIf(inQuery.IsLoginUncommonly != null, t => t.IsLoginUncommonly == inQuery.IsLoginUncommonly)
|
||||
.WhereIf(inQuery.IsLoginUncommonly != null, t => t.IsLoginUncommonly == inQuery.IsLoginUncommonly)
|
||||
.WhereIf(!string.IsNullOrEmpty(inQuery.LoginUserName), t => t.ActionUserName.Contains(inQuery.LoginUserName!))
|
||||
.WhereIf(!string.IsNullOrEmpty(inQuery.LoginFaildName), t => t.ActionUserName.Contains(inQuery.LoginFaildName!))
|
||||
.WhereIf(!string.IsNullOrEmpty(inQuery.IP), t => t.IP.Contains(inQuery.IP!))
|
||||
|
||||
@@ -173,7 +173,14 @@ namespace IRaCIS.Core.Application.Service
|
||||
|
||||
var identityUserId = NewId.NextSequentialGuid();
|
||||
|
||||
var identityUser = _mapper.Map<IdentityUser>(item.FirstOrDefault());
|
||||
var selectUser = item.OrderByDescending(t => t.Status).FirstOrDefault();
|
||||
|
||||
var identityUser = _mapper.Map<IdentityUser>(selectUser);
|
||||
|
||||
if (identityUser.IsFirstAdd)
|
||||
{
|
||||
identityUser.UserName = "";
|
||||
}
|
||||
|
||||
identityUser.Id = identityUserId;
|
||||
|
||||
@@ -185,15 +192,15 @@ namespace IRaCIS.Core.Application.Service
|
||||
await _identityUserRepository.SaveChangesAsync();
|
||||
}
|
||||
|
||||
// UPDATE[User]
|
||||
//SET
|
||||
// UserName = IdentityUser.UserName,
|
||||
// FirstName = IdentityUser.FirstName,
|
||||
//LastName = IdentityUser.LastName,
|
||||
// EMail = IdentityUser.EMail
|
||||
//FROM[User]
|
||||
//INNER JOIN IdentityUser
|
||||
//ON[User].IdentityUserId = IdentityUser.Id
|
||||
// UPDATE[User]
|
||||
//SET
|
||||
// UserName = IdentityUser.UserName,
|
||||
// FirstName = IdentityUser.FirstName,
|
||||
//LastName = IdentityUser.LastName,
|
||||
// EMail = IdentityUser.EMail
|
||||
//FROM[User]
|
||||
//INNER JOIN IdentityUser
|
||||
//ON[User].IdentityUserId = IdentityUser.Id
|
||||
|
||||
|
||||
|
||||
@@ -365,7 +372,7 @@ namespace IRaCIS.Core.Application.Service
|
||||
ConfirmTime = confirm.ConfirmTime,
|
||||
RealName = confirm.ConfirmUser.FullName,
|
||||
UserName = confirm.ConfirmUser.UserName,
|
||||
|
||||
|
||||
|
||||
FullFilePath = sysDoc.Path
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user