Merge branch 'Test_IRC_Net8' of http://192.168.3.68:2000/XCKJ/irc-netcore-api into Test_IRC_Net8

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

IRaCIS.Core.Application/Service/Management/UserService.cs

@@ -490,6 +490,9 @@ 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.BeginCreateTime != null, t => t.CreateTime >= param.BeginCreateTime)
+                  .WhereIf(param.EndCreateTime != null, t => t.CreateTime <= param.EndCreateTime)
                   .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)