IRaCIS.Core.Application/Service/Inspection/DTO/InspectionModel.cs

@@ -472,7 +472,7 @@ namespace IRaCIS.Core.Application.Service.Inspection.DTO
         /// </summary>
         public string OpByUserName { get; set; } = string.Empty;
 
-        public string? CreateUserRealName { get; set; }
+        public string? CreateUserName { get; set; }
 
         /// <summary>
         /// 阅读片人

IRaCIS.Core.Application/Service/Inspection/InspectionService.cs

@@ -198,7 +198,7 @@ namespace IRaCIS.Core.Application.Service.Inspection
                  .WhereIf(inQuery.ModuleType != null, x => x.ModuleTypeId == inQuery.ModuleType)
                  .WhereIf(!inQuery.Description.IsNullOrEmpty(), x => x.Description.Contains(inQuery.Description) || x.DescriptionCN.Contains(inQuery.Description))
                  .WhereIf(!inQuery.OpByUserName.IsNullOrEmpty(), x => x.CreateUserName.Contains(inQuery.OpByUserName))
-                  .WhereIf(!inQuery.CreateUserRealName.IsNullOrEmpty(), x => x.CreateUserName.Contains(inQuery.CreateUserRealName) || x.CreateUserRealName.Contains(inQuery.CreateUserRealName))
+                  .WhereIf(!inQuery.CreateUserName.IsNullOrEmpty(), x => x.CreateUserName.Contains(inQuery.CreateUserName) || x.CreateUserRealName.Contains(inQuery.CreateUserName))
 
                  //.WhereIf(!dto.SubjectInfo.IsNullOrEmpty(), x => x.SubjectCode.Contains(dto.SubjectInfo))
                  .WhereIf(inQuery.IsSign != null, x => x.IsSign == inQuery.IsSign);

IRaCIS.Core.Application/Service/TrialSiteUser/DTO/UserTrialViewModel.cs

@@ -94,15 +94,6 @@ 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
     {
 

IRaCIS.Core.Application/Service/TrialSiteUser/TrialMaintenanceService.cs

@@ -21,10 +21,10 @@ namespace IRaCIS.Core.Application.Service
     {
 
         [HttpGet]
-        public async Task<List<TrialIdentityUserBasicInfo>> GetTrialUserList(Guid trialId)
+        public async Task<List<TrialUserBasicInfo>> GetTrialUserList(Guid trialId)
         {
-            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 })
+            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 })
                   .ToListAsync();
         }