diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/UserTrialViewModel.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/UserTrialViewModel.cs index 792d29b82..a886d11d6 100644 --- a/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/UserTrialViewModel.cs +++ b/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/UserTrialViewModel.cs @@ -38,6 +38,8 @@ namespace IRaCIS.Application.Contracts public DateTime? DeletedTime { get; set; } public DateTime UpdateTime { get; set; } public DateTime CreateTime { get; set; } + + public Guid TrialSiteId { get; set; } } public class UserTrialDTO : UserTrialCommand diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialSiteService.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialSiteService.cs index 6e3cdc5e9..e6697c018 100644 --- a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialSiteService.cs +++ b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialSiteService.cs @@ -27,7 +27,14 @@ namespace IRaCIS.Core.Application.Services var query = _trialSiteUserRoleRepository.Where(t => t.TrialId == trialId && t.TrialSiteId == siteId).IgnoreQueryFilters() .ProjectTo(_mapper.ConfigurationProvider); - return await query.ToListAsync(); + var list = await query.ToListAsync(); + + foreach (var item in list) + { + item.TrialSiteId = siteId; + } + + return list; } diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/_MapConfig.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/_MapConfig.cs index e6af9ea2a..cb7c43c50 100644 --- a/IRaCIS.Core.Application/Service/TrialSiteUser/_MapConfig.cs +++ b/IRaCIS.Core.Application/Service/TrialSiteUser/_MapConfig.cs @@ -92,13 +92,13 @@ namespace IRaCIS.Core.Application.Service CreateMap(); var trialSiteId = Guid.Empty; - CreateMap().IncludeMembers(t => t.UserRole) - .ForMember(d => d.UserRealName, u => u.MapFrom(s => s.UserRole.FullName)) + CreateMap().IncludeMembers(t => t.UserRole.IdentityUser) + .ForMember(d => d.UserRealName, u => u.MapFrom(s => s.UserRole.IdentityUser.FullName)) .ForMember(d => d.TrialSiteId, u => u.MapFrom(t => trialSiteId)) .ForMember(d => d.UserType, u => u.MapFrom(t => t.UserRole.UserTypeRole.UserTypeShortName)) .ForMember(d => d.IsSelect, u => u.MapFrom(t => t.Trial.TrialSiteUserList.Any(k => k.UserId == t.UserId && k.TrialSiteId== trialSiteId))); - CreateMap(); + CreateMap(); var trialId = Guid.Empty;