IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs

@@ -911,7 +911,7 @@ namespace IRaCIS.Core.Application
             _mapper.Map(trialConfig, trialInfo);
             trialInfo.UpdateTime = DateTime.Now;
 
-            //_trialRepository.MarkAsModified(trialInfo, nameof(trialInfo.TrialObjectNameList));
+            _trialRepository.MarkAsModified(trialInfo, nameof(trialInfo.TrialObjectNameList));
 
             //await _readingQuestionCriterionTrialRepository.BatchUpdateNoTrackingAsync(t => t.TrialId == trialConfig.TrialId && t.IsSigned == false, u => new ReadingQuestionCriterionTrial() { CriterionModalitys = trialConfig.Modalitys });
 

IRaCIS.Core.Domain/Trial/Trial.cs

@@ -268,8 +268,7 @@ public partial class Trial : BaseFullDeleteAuditEntity
     //public List<TrialObjectNameConfig> TrialObjectNameList => JsonConvert.DeserializeObject<List<TrialObjectNameConfig>>(TrialObjectNameConfigStr) ?? new List<TrialObjectNameConfig>();
 }
 
-[ComplexType]
+public struct TrialObjectNameConfig
-public class TrialObjectNameConfig
 {
     public string Name { get; set; }
 

IRaCIS.Core.Infra.EFCore/Context/IRaCISDBContext.cs

@@ -2,7 +2,6 @@
 using IRaCIS.Core.Domain.Models;
 using IRaCIS.Core.Infra.EFCore.Common;
 using IRaCIS.Core.Infrastructure.Encryption;
-using IRaCIS.Core.Infrastructure.Extention;
 using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 using Newtonsoft.Json;
 using System.ComponentModel;
@@ -72,17 +71,8 @@ public class IRaCISDBContext : DbContext
 
         modelBuilder.Entity<Trial>(entity =>
         {
-            //entity.Property(e => e.TrialObjectNameList).HasConversion(v => v == null ? "[]" : JsonConvert.SerializeObject(v),
+            entity.Property(e => e.TrialObjectNameList).HasConversion(v => v == null ||v.Count==0 ? "[]" : JsonConvert.SerializeObject(v),
-            //    v => string.IsNullOrEmpty(v) ? new List<TrialObjectNameConfig>() : JsonConvert.DeserializeObject<List<TrialObjectNameConfig>>(v));
+                v => string.IsNullOrEmpty(v) ? new List<TrialObjectNameConfig>() : JsonConvert.DeserializeObject<List<TrialObjectNameConfig>>(v));
-
-            entity.OwnsMany(x => x.TrialObjectNameList, ownedNavigationBuilder =>
-            {
-                ownedNavigationBuilder.ToJson();
-
-                //ownedNavigationBuilder.HasKey(t=>t.Name);
-
-
-            });
         });
 
         #region pgsql codefirst 配置 暂时屏蔽

IRaCIS.Core.Infra.EFCore/Interceptor/AuditEntityInterceptor.cs

@@ -142,8 +142,7 @@ public class AuditEntityInterceptor(IUserInfo _userInfo,
         var inspectionGeneralIdList = context.ChangeTracker.Entries().Where(t => typeof(DataInspection).IsAssignableFrom(t.Entity.GetType())).Select(t => ((DataInspection)t.Entity).GeneralId).ToList();
 
         var entities = context.ChangeTracker.Entries().Where(u => (u.State == EntityState.Modified || u.State == EntityState.Deleted || u.State == EntityState.Added))
-            .Where(t => !typeof(DataInspection).IsAssignableFrom(t.Entity.GetType()) && typeof(Entity).IsAssignableFrom(t.Entity.GetType())
+            .Where(t => !typeof(DataInspection).IsAssignableFrom(t.Entity.GetType()) && !inspectionGeneralIdList.Contains(((Entity)t.Entity).Id))
-            && !inspectionGeneralIdList.Contains(((Entity)t.Entity).Id))
             .ToList();
         AuditingData auditingData = new AuditingData((IRaCISDBContext)context, _userInfo);