修改维护方法
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/push Build is passing
Details
parent
77798e929e
commit
63919c8f6b
|
@ -161,7 +161,6 @@ namespace IRaCIS.Core.Application.Service
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
public async Task<IResponseOutput> UserMutiAccount([FromServices] IRepository<IdentityUser> _identityUserRepository)
|
public async Task<IResponseOutput> UserMutiAccount([FromServices] IRepository<IdentityUser> _identityUserRepository)
|
||||||
{
|
{
|
||||||
_userInfo.IsNotNeedInspection = true;
|
|
||||||
|
|
||||||
if ((await _identityUserRepository.FirstOrDefaultAsync()) == null)
|
if ((await _identityUserRepository.FirstOrDefaultAsync()) == null)
|
||||||
{
|
{
|
||||||
|
|
|
@ -1735,13 +1735,11 @@ namespace IRaCIS.Core.Infra.EFCore.Common
|
||||||
|
|
||||||
var entity = item.Entity as IdentityUser;
|
var entity = item.Entity as IdentityUser;
|
||||||
|
|
||||||
if (!_userInfo.IsNotNeedInspection)
|
|
||||||
{
|
|
||||||
await InsertInspection<IdentityUser>(entity, type, x => new InspectionConvertDTO
|
await InsertInspection<IdentityUser>(entity, type, x => new InspectionConvertDTO
|
||||||
{
|
{
|
||||||
IsDistinctionInterface = type == AuditOpt.Update ? true : false,
|
IsDistinctionInterface = type == AuditOpt.Update ? true : false,
|
||||||
});
|
});
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// 项目参与人员
|
// 项目参与人员
|
||||||
|
@ -1753,33 +1751,30 @@ namespace IRaCIS.Core.Infra.EFCore.Common
|
||||||
|
|
||||||
var identityUser = await _dbContext.IdentityUser.AsNoTracking().Where(x => x.Id == entity.IdentityUserId).FirstOrDefaultAsync();
|
var identityUser = await _dbContext.IdentityUser.AsNoTracking().Where(x => x.Id == entity.IdentityUserId).FirstOrDefaultAsync();
|
||||||
|
|
||||||
//if (type == AuditOpt.Update)
|
// 变更维护数据,会维护数据,不能插入稽查
|
||||||
//{
|
if (_userInfo.IsNotNeedInspection == false)
|
||||||
// extraIndentification = "/" + entity.IsDeleted.ToString();
|
|
||||||
//}
|
|
||||||
|
|
||||||
|
|
||||||
//var user = await _dbContext.Users.Include(x => x.UserTypeRole).FirstOrDefaultAsync(x => x.Id == entity.UserId);
|
|
||||||
await InsertInspection<TrialIdentityUser>(entity, type, x => new InspectionConvertDTO
|
|
||||||
{
|
|
||||||
//IsDistinctionInterface = true ,
|
|
||||||
TrialId = x.TrialId,
|
|
||||||
IsDistinctionInterface=false,
|
|
||||||
ObjectRelationParentId = x.TrialId,
|
|
||||||
ExtraIndentification = extraIndentification,
|
|
||||||
//ObjectRelationParentId2 = x.IdentityUserId,
|
|
||||||
}, new
|
|
||||||
{
|
{
|
||||||
|
await InsertInspection<TrialIdentityUser>(entity, type, x => new InspectionConvertDTO
|
||||||
|
{
|
||||||
|
//IsDistinctionInterface = true ,
|
||||||
|
TrialId = x.TrialId,
|
||||||
|
IsDistinctionInterface = false,
|
||||||
|
ObjectRelationParentId = x.TrialId,
|
||||||
|
ExtraIndentification = extraIndentification,
|
||||||
|
//ObjectRelationParentId2 = x.IdentityUserId,
|
||||||
|
}, new
|
||||||
|
{
|
||||||
|
|
||||||
identityUser.FullName,
|
identityUser.FullName,
|
||||||
identityUser.EMail,
|
identityUser.EMail,
|
||||||
identityUser.Code,
|
identityUser.Code,
|
||||||
identityUser.UserCode,
|
identityUser.UserCode,
|
||||||
identityUser.UserName,
|
identityUser.UserName,
|
||||||
identityUser.DepartmentName,
|
identityUser.DepartmentName,
|
||||||
identityUser.Phone,
|
identityUser.Phone,
|
||||||
identityUser.OrganizationName,
|
identityUser.OrganizationName,
|
||||||
});
|
});
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// 项目人员
|
// 项目人员
|
||||||
|
|
Loading…
Reference in New Issue