From 73912fd875fef06fed64c24f8632012916b86b65 Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Tue, 25 Feb 2025 10:26:55 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Service/Management/DTO/UserModel.cs                    | 2 ++
 IRaCIS.Core.Application/Service/Management/UserService.cs  | 1 +
 .../Service/TrialSiteUser/TrialMaintenanceService.cs       | 7 +++++--
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/Management/DTO/UserModel.cs b/IRaCIS.Core.Application/Service/Management/DTO/UserModel.cs
index c69e23526..94228c00b 100644
--- a/IRaCIS.Core.Application/Service/Management/DTO/UserModel.cs
+++ b/IRaCIS.Core.Application/Service/Management/DTO/UserModel.cs
@@ -311,6 +311,8 @@ namespace IRaCIS.Application.Contracts
         public DateTime? BeginLastChangePassWordTime { get; set; }
 
         public DateTime? EndLastChangePassWordTime { get; set; }
+
+        public UserCeateSource? UserCeateSource { get; set; }
     }
 
     public class UserRoleInfoDTO
diff --git a/IRaCIS.Core.Application/Service/Management/UserService.cs b/IRaCIS.Core.Application/Service/Management/UserService.cs
index 6c84df065..f0fc68b48 100644
--- a/IRaCIS.Core.Application/Service/Management/UserService.cs
+++ b/IRaCIS.Core.Application/Service/Management/UserService.cs
@@ -514,6 +514,7 @@ namespace IRaCIS.Core.Application.Service
                  .WhereIf(inQuery.UserState != null, t => t.Status == inQuery.UserState)
                  .WhereIf(inQuery.IsTestUser != null, t => t.IsTestUser == inQuery.IsTestUser)
                  .WhereIf(inQuery.IsZhiZhun != null, t => t.IsZhiZhun == inQuery.IsZhiZhun)
+                  .WhereIf(inQuery.UserCeateSource != null, t => t.UserCeateSource == inQuery.UserCeateSource)
                  .ProjectTo<UserListDTO>(_mapper.ConfigurationProvider);
 
             return await userQueryable.ToPagedListAsync(inQuery);
diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialMaintenanceService.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialMaintenanceService.cs
index bdcd78907..d7df6cdd4 100644
--- a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialMaintenanceService.cs
+++ b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialMaintenanceService.cs
@@ -30,7 +30,7 @@ namespace IRaCIS.Core.Application.Service
         }
 
         [HttpPost]
-        public async Task<PageOutput<IdentityUserJoinedTrialView>> GetUserJoinedTrialList(IdentityUserJoinedTrialQuery inQuery)
+        public async Task<IResponseOutput<PageOutput<IdentityUserJoinedTrialView>>> GetUserJoinedTrialList(IdentityUserJoinedTrialQuery inQuery)
         {
             var list = await _trialIdentityUserRepository.Where(t => t.IdentityUserId == inQuery.IdentityUserId, false, true)
               .WhereIf(!string.IsNullOrEmpty(inQuery.TrialCode), o => o.Trial.TrialCode.Contains(inQuery.TrialCode))
@@ -54,7 +54,10 @@ namespace IRaCIS.Core.Application.Service
 
                 }).ToPagedListAsync(inQuery);
 
-            return list;
+            var info = await _trialIdentityUserRepository.Where(t => t.IdentityUserId == inQuery.IdentityUserId).Select(t =>
+            new { t.IdentityUser.CreateTime, t.IdentityUser.UserCeateSource, t.Trial.ResearchProgramNo, t.Trial.TrialCode }).FirstOrDefaultAsync();
+
+            return ResponseOutput.Ok(list, info);
         }
 
         #region 多账户调整已修改