diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/UserTrialViewModel.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/UserTrialViewModel.cs index e8e20d3ee..b7eb58319 100644 --- a/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/UserTrialViewModel.cs +++ b/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/UserTrialViewModel.cs @@ -212,6 +212,8 @@ namespace IRaCIS.Application.Contracts { public Guid Id { get; set; } + public string UserTypeShortName { get; set; } + public bool IsDeleted { get; set; } public DateTime CreateTime { get; set; } @@ -388,8 +390,6 @@ namespace IRaCIS.Application.Contracts public Guid TrialSiteId { get; set; } - //public int? UserCount { get; set; } - public string TrialSiteCode { get; set; } = String.Empty; public string TrialSiteName { get; set; } = String.Empty; diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialMaintenanceService.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialMaintenanceService.cs index fbb6c2697..26fd2f0fd 100644 --- a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialMaintenanceService.cs +++ b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialMaintenanceService.cs @@ -58,6 +58,7 @@ namespace IRaCIS.Core.Application.Service TrialUserRoleList = t.TrialUserRoleList.Select(ur => new TrialIdentityUserRoleDto() { Id = ur.Id, + UserTypeShortName=ur.UserRole.UserTypeRole.UserTypeShortName, IsDeleted = ur.IsDeleted, CreateTime = ur.CreateTime, UpdateTime = ur.UpdateTime diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/_MapConfig2.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/_MapConfig2.cs index 452c94026..0a05dc208 100644 --- a/IRaCIS.Core.Application/Service/TrialSiteUser/_MapConfig2.cs +++ b/IRaCIS.Core.Application/Service/TrialSiteUser/_MapConfig2.cs @@ -59,11 +59,11 @@ namespace IRaCIS.Core.Application.Service CreateMap(); - CreateMap() + CreateMap().IncludeMembers(t=>t.UserRole.IdentityUser) .ForMember(t => t.IdentityUserId, u => u.MapFrom(c => c.UserRole.IdentityUserId)) .ForMember(t => t.UserType, u => u.MapFrom(c => c.UserRole.UserTypeRole.UserTypeShortName)); - + CreateMap(); diff --git a/IRaCIS.Core.Application/TestService.cs b/IRaCIS.Core.Application/TestService.cs index 6b78f601a..9f600f640 100644 --- a/IRaCIS.Core.Application/TestService.cs +++ b/IRaCIS.Core.Application/TestService.cs @@ -159,6 +159,7 @@ namespace IRaCIS.Core.Application.Service /// public async Task UserMutiAccount([FromServices] IRepository _identityUserRepository) { + _userInfo.IsNotNeedInspection = true; var userList = _userRoleRepository.Where().ToList(); @@ -189,6 +190,8 @@ namespace IRaCIS.Core.Application.Service /// public async Task UserTrialUser([FromServices] IRepository _trialIdentityUserRepository, [FromServices] IRepository _trialUserRoleReposiotry) { + _userInfo.IsNotNeedInspection = true; + var list = _trialUserRoleReposiotry.Where().Select(t => new { t.TrialId, t.UserRole.IdentityUserId, t.UserId, t.JoinTime, t.RemoveTime }).ToList();