From 008f5203c0a63a545eef8065fa5d434e4903c5e4 Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Tue, 15 Aug 2023 16:40:36 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=96=E9=83=A8=E7=94=A8=E6=88=B7=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Service/SiteSurvey/TrialSiteSurveyService.cs               | 2 +-
 .../Service/TrialSiteUser/DTO/TrialExternalUserViewModel.cs    | 2 +-
 IRaCIS.Core.Application/Service/TrialSiteUser/_MapConfig.cs    | 3 ++-
 IRaCIS.Core.Domain/TrialSiteUser/TrialExternalUser.cs          | 3 ++-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/SiteSurvey/TrialSiteSurveyService.cs b/IRaCIS.Core.Application/Service/SiteSurvey/TrialSiteSurveyService.cs
index 784239717..8a6ec6d21 100644
--- a/IRaCIS.Core.Application/Service/SiteSurvey/TrialSiteSurveyService.cs
+++ b/IRaCIS.Core.Application/Service/SiteSurvey/TrialSiteSurveyService.cs
@@ -669,7 +669,7 @@ namespace IRaCIS.Core.Application.Contracts
 
 
                 //已生成的不管  管的只需要是  生成失败的并且需要生成账号的
-                var needGenerateList = _trialSiteUserSurveyRepository.Where(t => t.TrialSiteSurveyId == trialSiteSurveyId && t.IsGenerateAccount && t.IsGenerateSuccess != true).ProjectTo<TrialSiteUserSurveyView>(_mapper.ConfigurationProvider).ToList();
+                var needGenerateList = _trialSiteUserSurveyRepository.Where(t => t.TrialSiteSurveyId == trialSiteSurveyId && t.IsGenerateAccount && t.IsJoin != true ).ProjectTo<TrialSiteUserSurveyView>(_mapper.ConfigurationProvider).ToList();
 
 
                 await GenerateAccountAsync(needGenerateList, trialId);
diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialExternalUserViewModel.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialExternalUserViewModel.cs
index ca5d4e631..69e0d5b83 100644
--- a/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialExternalUserViewModel.cs
+++ b/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialExternalUserViewModel.cs
@@ -50,7 +50,7 @@ namespace IRaCIS.Core.Application.ViewModel
 
 
 
-
+        public UserTypeEnum? UserTypeEnum { get; set; }
 
         public DateTime? ExpireTime { get; set; }
 
diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/_MapConfig.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/_MapConfig.cs
index 27f03fa41..c8e56eebb 100644
--- a/IRaCIS.Core.Application/Service/TrialSiteUser/_MapConfig.cs
+++ b/IRaCIS.Core.Application/Service/TrialSiteUser/_MapConfig.cs
@@ -206,7 +206,8 @@ namespace IRaCIS.Core.Application.Service
             CreateMap<TrialExternalUser, TrialExternalUserAddOrEdit>().ReverseMap();
             CreateMap<TrialExternalUserAddOrEdit, User>();
 
-            CreateMap<TrialExternalUser, TrialExternalUserView>();
+            CreateMap<TrialExternalUser, TrialExternalUserView>()
+                .ForMember(t=>t.UserTypeEnum,u=>u.MapFrom(c=>c.SystemUser.UserTypeEnum));
 
 
             CreateMap<User, TrialExternalUser>().ReverseMap();
diff --git a/IRaCIS.Core.Domain/TrialSiteUser/TrialExternalUser.cs b/IRaCIS.Core.Domain/TrialSiteUser/TrialExternalUser.cs
index 297b37279..148c6e53c 100644
--- a/IRaCIS.Core.Domain/TrialSiteUser/TrialExternalUser.cs
+++ b/IRaCIS.Core.Domain/TrialSiteUser/TrialExternalUser.cs
@@ -92,7 +92,8 @@ namespace IRaCIS.Core.Domain.Models
 
 		public Guid SystemUserId { get; set; }
 
-
+		[JsonIgnore]
+		public User SystemUser { get; set; }
 
 		public bool IsJoin { get; set; }