From da27b65e56f0f145a976b72dddda1f1df6a8cef3 Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Fri, 14 Feb 2025 16:11:48 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=99=BB=E5=BD=95=E6=97=A5?= =?UTF-8?q?=E5=BF=97=20=E9=A1=B9=E7=9B=AE=E5=8F=82=E4=B8=8E=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/TrialSiteUser/DTO/UserTrialViewModel.cs | 9 +++++++++ .../Service/TrialSiteUser/TrialMaintenanceService.cs | 6 +++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/UserTrialViewModel.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/UserTrialViewModel.cs index fcad91614..23fee79b0 100644 --- a/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/UserTrialViewModel.cs +++ b/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/UserTrialViewModel.cs @@ -94,6 +94,15 @@ namespace IRaCIS.Application.Contracts public Guid UserId { get; set; } } + public class TrialIdentityUserBasicInfo + { + public Guid IdentityUserId { get; set; } + + public string UserName { get; set; } + + public string FullName { get; set; } + } + public class TrialMaintenanceDTO : UserTrialCommand { diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialMaintenanceService.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialMaintenanceService.cs index 24db29490..f5b2befd9 100644 --- a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialMaintenanceService.cs +++ b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialMaintenanceService.cs @@ -21,10 +21,10 @@ namespace IRaCIS.Core.Application.Service { [HttpGet] - public async Task> GetTrialUserList(Guid trialId) + public async Task> GetTrialUserList(Guid trialId) { - return await _trialUseRoleRepository.Where(t => t.TrialId == trialId, ignoreQueryFilters: true) - .Select(t => new TrialUserBasicInfo() { FullName = t.UserRole.FullName, UserId = t.UserId, UserTypeId = t.UserRole.UserTypeId, UserName = t.UserRole.IdentityUser.UserName }) + return await _trialIdentityUserRepository.Where(t => t.TrialId == trialId, ignoreQueryFilters: true) + .Select(t => new TrialIdentityUserBasicInfo() { FullName = t.IdentityUser.FullName, IdentityUserId = t.IdentityUserId, UserName = t.IdentityUser.UserName }) .ToListAsync(); }