From 1d4eedf5bbcae6af5559751d6e4f74c999c9dd06 Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Wed, 25 Dec 2024 14:21:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=98=A0=E5=B0=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Service/TrialSiteUser/DTO/UserTrialViewModel.cs           | 4 ++--
 .../Service/TrialSiteUser/TrialMaintenanceService.cs          | 1 +
 IRaCIS.Core.Application/Service/TrialSiteUser/_MapConfig2.cs  | 4 ++--
 IRaCIS.Core.Application/TestService.cs                        | 3 +++
 4 files changed, 8 insertions(+), 4 deletions(-)

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<TrialUserRole, TrialIdentityUserRoleDto>();
 
-            CreateMap<TrialSiteUserRole, TrialSiteCRCListDTO>()
+            CreateMap<TrialSiteUserRole, TrialSiteCRCListDTO>().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<IdentityUser, TrialSiteCRCListDTO>();
 
 
 
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
         /// <returns></returns>
         public async Task<IResponseOutput> UserMutiAccount([FromServices] IRepository<IdentityUser> _identityUserRepository)
         {
+            _userInfo.IsNotNeedInspection = true;
 
             var userList = _userRoleRepository.Where().ToList();
 
@@ -189,6 +190,8 @@ namespace IRaCIS.Core.Application.Service
         /// <returns></returns>
         public async Task<IResponseOutput> UserTrialUser([FromServices] IRepository<TrialIdentityUser> _trialIdentityUserRepository, [FromServices] IRepository<TrialUserRole> _trialUserRoleReposiotry)
         {
+            _userInfo.IsNotNeedInspection = true;
+
             var list = _trialUserRoleReposiotry.Where().Select(t => new { t.TrialId, t.UserRole.IdentityUserId, t.UserId, t.JoinTime, t.RemoveTime }).ToList();