From 862390ae783199904d106a63524b58c5da5ca4f3 Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Wed, 29 May 2024 15:45:21 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=82=AE=E7=AE=B1=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 IRaCIS.Core.Application/Service/Management/DTO/UserModel.cs | 6 ++++++
 IRaCIS.Core.Application/Service/Management/UserService.cs   | 1 +
 2 files changed, 7 insertions(+)

diff --git a/IRaCIS.Core.Application/Service/Management/DTO/UserModel.cs b/IRaCIS.Core.Application/Service/Management/DTO/UserModel.cs
index 4ff5d1f95..c0dbc9df8 100644
--- a/IRaCIS.Core.Application/Service/Management/DTO/UserModel.cs
+++ b/IRaCIS.Core.Application/Service/Management/DTO/UserModel.cs
@@ -213,6 +213,12 @@ namespace IRaCIS.Application.Contracts
 
         public bool ? IsZhiZhun { get; set; }
         public UserStateEnum? UserState { get; set; }
+
+        public DateTime? BeginCreateTime { get; set; }
+
+        public DateTime? EndCreateTime { get; set; }
+
+        public string? EMail { get; set; }
     }
 
     public class UserRoleInfoDTO
diff --git a/IRaCIS.Core.Application/Service/Management/UserService.cs b/IRaCIS.Core.Application/Service/Management/UserService.cs
index 87385eec5..9d539b80f 100644
--- a/IRaCIS.Core.Application/Service/Management/UserService.cs
+++ b/IRaCIS.Core.Application/Service/Management/UserService.cs
@@ -488,6 +488,7 @@ namespace IRaCIS.Application.Services
                   .WhereIf(!string.IsNullOrWhiteSpace(param.RealName), t => t.FullName.Contains(param.RealName))
                   .WhereIf(!string.IsNullOrWhiteSpace(param.Phone), t => t.Phone.Contains(param.Phone))
                   .WhereIf(!string.IsNullOrWhiteSpace(param.OrganizationName), t => t.OrganizationName.Contains(param.OrganizationName))
+                   .WhereIf(!string.IsNullOrWhiteSpace(param.EMail), t => t.EMail.Contains(param.EMail))
                   .WhereIf(param.UserType != null, t => t.UserTypeId == param.UserType)
                   .WhereIf(param.UserState != null, t => t.Status == param.UserState)
                   .WhereIf(param.IsTestUser != null, t => t.IsTestUser == param.IsTestUser)