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(_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> GetUserJoinedTrialList(IdentityUserJoinedTrialQuery inQuery) + public async Task>> 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 多账户调整已修改