修改维护方法
continuous-integration/drone/push Build is passing Details

Uat_IRC_Net8
hang 2025-01-16 15:13:58 +08:00
parent 77798e929e
commit 63919c8f6b
2 changed files with 23 additions and 29 deletions

View File

@ -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)
{ {

View File

@ -1735,14 +1735,12 @@ 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,
}); });
} }
}
// 项目参与人员 // 项目参与人员
foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(TrialIdentityUser))) foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(TrialIdentityUser)))
@ -1753,18 +1751,14 @@ 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 await InsertInspection<TrialIdentityUser>(entity, type, x => new InspectionConvertDTO
{ {
//IsDistinctionInterface = true , //IsDistinctionInterface = true ,
TrialId = x.TrialId, TrialId = x.TrialId,
IsDistinctionInterface=false, IsDistinctionInterface = false,
ObjectRelationParentId = x.TrialId, ObjectRelationParentId = x.TrialId,
ExtraIndentification = extraIndentification, ExtraIndentification = extraIndentification,
//ObjectRelationParentId2 = x.IdentityUserId, //ObjectRelationParentId2 = x.IdentityUserId,
@ -1781,6 +1775,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common
identityUser.OrganizationName, identityUser.OrganizationName,
}); });
} }
}
// 项目人员 // 项目人员
foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(TrialUserRole))) foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(TrialUserRole)))