From 54cdd148898e7797804c4b16a9a1d8ac07f7445b Mon Sep 17 00:00:00 2001 From: he <109787524@qq.com> Date: Thu, 9 Jan 2025 11:01:26 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A8=BD=E6=9F=A5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Common/AuditingData.cs | 25 ++++++++++++++++--- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs b/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs index 890b14bd3..8526cd917 100644 --- a/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs +++ b/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs @@ -1716,20 +1716,37 @@ namespace IRaCIS.Core.Infra.EFCore.Common }); } + foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(UserRole))) + { + 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(entity, type, x => new InspectionConvertDTO + { + IsDistinctionInterface = type == AuditOpt.Update ? true : false, + }); + } // 项目人员 foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(TrialUserRole))) { var type = GetEntityAuditOpt(item); - var entity = item.Entity as TrialUserRole; + string extraIndentification = string.Empty; + if (type == AuditOpt.Update) + { + extraIndentification= "/" + entity.IsDeleted.ToString(); + } + + //var user = await _dbContext.Users.Include(x => x.UserTypeRole).FirstOrDefaultAsync(x => x.Id == entity.UserId); await InsertInspection(entity, type, x => new InspectionConvertDTO { IsDistinctionInterface = type == AuditOpt.Update ? true : false, TrialId = x.TrialId, ObjectRelationParentId = x.TrialId, + ExtraIndentification = extraIndentification, ObjectRelationParentId2 = x.UserId, }); } @@ -3775,10 +3792,10 @@ namespace IRaCIS.Core.Infra.EFCore.Common /// public string GetInspectionRecordIdentification(T entityObj, string type, bool IsDistinctionInterface = true, bool isSelfDefine = false) { - var entityType = _dbContext.Model.FindEntityType(entityObj.GetType()); - var tableName = entityType.GetTableName(); + //var entityType = _dbContext.Model.FindEntityType(entityObj.GetType()); + //var tableName = entityType.GetTableName(); - var entityTypeName = tableName.IsNotNullOrEmpty() ? tableName : entityObj.GetType().Name; + var entityTypeName = entityObj.GetType().Name; //文档签署这块，不区分系统和项目的 需要处理为同一个标识 if (typeof(T) == typeof(TrialDocConfirmedUser) || typeof(T) == typeof(SystemDocConfirmedUser))