From 8678c3602fec2169b4951248d5c8193b66e17a3d Mon Sep 17 00:00:00 2001
From: hang <87227557@qq.com>
Date: Tue, 10 Sep 2024 23:59:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AF=BC=E8=88=AA=E5=B1=9E?=
 =?UTF-8?q?=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Service/TrialSiteUser/TrialMaintenanceService.cs |  2 +-
 .../Service/TrialSiteUser/_MapConfig.cs              |  2 +-
 IRaCIS.Core.Domain/TrialSiteUser/TrialSiteUser.cs    |  3 +--
 IRaCIS.Core.Domain/TrialSiteUser/TrialUser.cs        |  3 ---
 .../EntityConfigration/TrialUserConfigration.cs      | 12 ------------
 5 files changed, 3 insertions(+), 19 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialMaintenanceService.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialMaintenanceService.cs
index 0198b9589..57f4ad08c 100644
--- a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialMaintenanceService.cs
+++ b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialMaintenanceService.cs
@@ -67,7 +67,7 @@ namespace IRaCIS.Application.Services
                  .WhereIf(inQuery.UserTypeId != null, t => t.User.UserTypeId == inQuery.UserTypeId)
                 .WhereIf(!string.IsNullOrWhiteSpace(inQuery.UserRealName), t => (t.User.FullName).Contains(inQuery.UserRealName))
                 .WhereIf(!string.IsNullOrWhiteSpace(inQuery.OrganizationName), t => t.User.OrganizationName.Contains(inQuery.OrganizationName))
-                .ProjectTo<AssginSiteCRCListDTO>(_mapper.ConfigurationProvider, new { trialSiteId = inQuery.TrialSiteId });
+                .ProjectTo<AssginSiteCRCListDTO>(_mapper.ConfigurationProvider);
 
             return await query.ToPagedListAsync(inQuery);
 
diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/_MapConfig.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/_MapConfig.cs
index 543e702de..ed572a3c3 100644
--- a/IRaCIS.Core.Application/Service/TrialSiteUser/_MapConfig.cs
+++ b/IRaCIS.Core.Application/Service/TrialSiteUser/_MapConfig.cs
@@ -98,7 +98,7 @@ namespace IRaCIS.Core.Application.Service
               .ForMember(d => d.UserRealName, u => u.MapFrom(s => s.User.FullName))
               .ForMember(d => d.TrialSiteId, u => u.MapFrom(t => trialSiteId))
               .ForMember(d => d.UserType, u => u.MapFrom(t => t.User.UserTypeRole.UserTypeShortName))
-              .ForMember(d => d.IsSelect, u => u.MapFrom(t => t.SiteList.Any(k => k.TrialSiteId == trialSiteId)));
+              .ForMember(d => d.IsSelect, u => u.MapFrom(t => t.Trial.TrialSiteUserList.Any(k => k.UserId == t.UserId)));
             CreateMap<User, AssginSiteCRCListDTO>();
 
             var trialId = Guid.Empty;
diff --git a/IRaCIS.Core.Domain/TrialSiteUser/TrialSiteUser.cs b/IRaCIS.Core.Domain/TrialSiteUser/TrialSiteUser.cs
index 4cdda8998..ad366265a 100644
--- a/IRaCIS.Core.Domain/TrialSiteUser/TrialSiteUser.cs
+++ b/IRaCIS.Core.Domain/TrialSiteUser/TrialSiteUser.cs
@@ -27,8 +27,7 @@ namespace IRaCIS.Core.Domain.Models
 
         [JsonIgnore]
         public TrialSite TrialSite { get; set; }
-        [JsonIgnore]
-        public TrialUser TrialUser { get; set; }
+
         #endregion
         public Guid TrialSiteId { get; set; }
 
diff --git a/IRaCIS.Core.Domain/TrialSiteUser/TrialUser.cs b/IRaCIS.Core.Domain/TrialSiteUser/TrialUser.cs
index 5ac7e53d8..1e5c15a93 100644
--- a/IRaCIS.Core.Domain/TrialSiteUser/TrialUser.cs
+++ b/IRaCIS.Core.Domain/TrialSiteUser/TrialUser.cs
@@ -17,9 +17,6 @@ namespace IRaCIS.Core.Domain.Models
         [JsonIgnore]
         [ForeignKey("UserId")]
         public User User { get; set; }
-
-        [JsonIgnore]
-        public List<TrialSiteUser> SiteList { get; set; }
         #endregion
         public Guid UserId { get; set; }
         public Guid TrialId { get; set; }
diff --git a/IRaCIS.Core.Infra.EFCore/EntityConfigration/TrialUserConfigration.cs b/IRaCIS.Core.Infra.EFCore/EntityConfigration/TrialUserConfigration.cs
index c0fefeb07..c4f782f0c 100644
--- a/IRaCIS.Core.Infra.EFCore/EntityConfigration/TrialUserConfigration.cs
+++ b/IRaCIS.Core.Infra.EFCore/EntityConfigration/TrialUserConfigration.cs
@@ -6,18 +6,6 @@ namespace IRaCIS.Core.Infra.EFCore.EntityConfigration
 {
 
 
-    public class TrialUserConfigration : IEntityTypeConfiguration<TrialUser>
-    {
-        public void Configure(EntityTypeBuilder<TrialUser> builder)
-        {
-            builder
-             .HasMany(s => s.SiteList)
-             .WithOne(c => c.TrialUser)
-             .HasForeignKey(s => new { s.TrialId, s.UserId })
-             .HasPrincipalKey(c => new { c.TrialId, c.UserId });
-
-        }
-    }
 
     public class SubjectCriteriaEvaluationConfigration : IEntityTypeConfiguration<SubjectCriteriaEvaluation>
     {