From 68a57594ffef7ca5a93702b5aede0550c8d08fad Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Mon, 20 Jan 2025 17:23:21 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Service/TrialSiteUser/DTO/UserTrialViewModel.cs            | 2 ++
 .../Service/TrialSiteUser/TrialMaintenanceService.cs           | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/UserTrialViewModel.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/UserTrialViewModel.cs
index 68bbb5fae..fcad91614 100644
--- a/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/UserTrialViewModel.cs
+++ b/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/UserTrialViewModel.cs
@@ -474,6 +474,8 @@ namespace IRaCIS.Application.Contracts
         public UserTypeEnum? UserTypeEnum { get; set; }
 
         public bool? IsUserRoleDisabled { get; set; }
+
+        public string? EMail { get; set; } 
     }
 
     public class TrialUserScreeningDTO : TrialUserAddCommand
diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialMaintenanceService.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialMaintenanceService.cs
index b6e0a3afd..eb25733da 100644
--- a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialMaintenanceService.cs
+++ b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialMaintenanceService.cs
@@ -169,6 +169,7 @@ namespace IRaCIS.Core.Application.Service
                  .WhereIf(inQuery.UserTypeEnum != null, t => t.UserTypeEnum == inQuery.UserTypeEnum)
                  .WhereIf(!string.IsNullOrWhiteSpace(inQuery.UserRealName), t => t.IdentityUser.FullName.Contains(inQuery.UserRealName))
                  .WhereIf(!string.IsNullOrWhiteSpace(inQuery.UserName), t => t.IdentityUser.UserName.Contains(inQuery.UserName))
+                  .WhereIf(!string.IsNullOrWhiteSpace(inQuery.EMail), t => t.IdentityUser.EMail.Contains(inQuery.EMail))
                  .WhereIf(!string.IsNullOrWhiteSpace(inQuery.OrganizationName), t => t.IdentityUser.OrganizationName.Contains(inQuery.OrganizationName))
                   .WhereIf(inQuery.IsUserRoleDisabled != null, t => t.IsUserRoleDisabled == inQuery.IsUserRoleDisabled)
                  .Select(t => new TrialUserRoleScreeningDto()
@@ -227,7 +228,7 @@ namespace IRaCIS.Core.Application.Service
                 }
                 else
                 {
-                    if (findTrialuser.IsDeleted = true)
+                    if (findTrialuser.IsDeleted == true)
                     {
                         findTrialuser.IsDeleted = false;
                         findTrialuser.DeletedTime = null;