From 87e1e1d09f7aee8b8cd71cc85c46c1f0eb737cb7 Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Tue, 24 May 2022 17:30:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A8=BD=E6=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Common/AuditingData.cs                    | 20 ++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs b/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs
index c1e5dcb1d..ff21905c1 100644
--- a/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs
+++ b/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs
@@ -244,7 +244,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common
                     Name = systemDocument.Name,
                     CreateTime = systemDocument.CreateTime,
                     IsSigned = "是",// 是否签署  添加了就是签署了
-                }, null, "UserSigned");
+                }, null);
             }
 
             // 项目文件签署
@@ -264,7 +264,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common
                     Name = trialDocument.Name,
                     CreateTime = trialDocument.CreateTime,
                     IsSigned = "是",// 是否签署  添加了就是签署了
-                }, null, "UserSigned");
+                }, null);
             }
 
             // 医生
@@ -875,7 +875,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common
         /// <param name="entityData">实体对象</param>
         /// <param name="entityTypeName">实体名称</param>
         /// <returns></returns>
-        public async Task InsertInspection<T>(EntityEntry data, string type, Expression<Func<T, DataInspection>> expression = null, object otherItem = null, T entityData = null, string? entityTypeName = null) where T : class
+        public async Task InsertInspection<T>(EntityEntry data, string type, Expression<Func<T, DataInspection>> expression = null, object otherItem = null, T entityData = null) where T : class
         {
             object entityobj = entityData == null ? data.Entity : entityData;
             DataInspection inspection = new DataInspection();
@@ -885,14 +885,16 @@ namespace IRaCIS.Core.Infra.EFCore.Common
                 var entity = entityobj as T;
                 inspection = f(entity);
             }
-            if (entityTypeName == null)
+
+            var entityTypeName = entityobj.GetType().Name;
+
+            //文档签署这块，不区分系统和项目的 需要处理为同一个标识
+            if (typeof(T) == typeof(TrialDocUserTypeConfirmedUser) || typeof(T) == typeof(SystemDocConfirmedUser))
             {
-                entityTypeName = entityobj.GetType().Name;
-            }
-            else
-            {
-                entityTypeName = "New/" + entityTypeName;
+                entityTypeName = "New/" + "UserSigned";
             }
+
+
             inspection.Identification = $"{_userInfo.RequestUrl}/{ entityTypeName}/{type}";
 
             #region 注释