外部用户修改

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);

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; }
 

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();

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; }