修改维护数据
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/push Build is passing
Details
parent
3f2315c96d
commit
538cfa279a
|
@ -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;
|
||||
|
||||
|
|
|
@ -1729,17 +1729,20 @@ namespace IRaCIS.Core.Infra.EFCore.Common
|
|||
});
|
||||
}
|
||||
|
||||
foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(UserRole)))
|
||||
foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(IdentityUser)))
|
||||
{
|
||||
var type = GetEntityAuditOpt(item);
|
||||
|
||||
var entity = item.Entity as UserRole;
|
||||
//var user = await _dbContext.Users.Include(x => x.UserTypeRole).FirstOrDefaultAsync(x => x.Id == entity.UserId);
|
||||
await InsertInspection<UserRole>(entity, type, x => new InspectionConvertDTO
|
||||
var entity = item.Entity as IdentityUser;
|
||||
|
||||
if (!_userInfo.IsNotNeedInspection)
|
||||
{
|
||||
await InsertInspection<IdentityUser>(entity, type, x => new InspectionConvertDTO
|
||||
{
|
||||
IsDistinctionInterface = type == AuditOpt.Update ? true : false,
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
// 项目参与人员
|
||||
foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(TrialIdentityUser)))
|
||||
|
@ -1764,7 +1767,8 @@ namespace IRaCIS.Core.Infra.EFCore.Common
|
|||
ObjectRelationParentId = x.TrialId,
|
||||
ExtraIndentification = extraIndentification,
|
||||
//ObjectRelationParentId2 = x.IdentityUserId,
|
||||
},new {
|
||||
}, new
|
||||
{
|
||||
|
||||
identityUser.FullName,
|
||||
identityUser.EMail,
|
||||
|
@ -1797,7 +1801,8 @@ namespace IRaCIS.Core.Infra.EFCore.Common
|
|||
ObjectRelationParentId = x.TrialId,
|
||||
ExtraIndentification = extraIndentification,
|
||||
ObjectRelationParentId2 = x.UserId,
|
||||
}, new {
|
||||
}, new
|
||||
{
|
||||
UserTypeEnum = userTypeEnum,
|
||||
});
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue