From bd9d78622f91caafbc35bb4418e0453276bf4ee2 Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Wed, 15 May 2024 16:35:57 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=90=9C=E7=B4=A2=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/IRaCIS.Core.Application/Service/Management/DTO/UserLogViewModel.cs b/IRaCIS.Core.Application/Service/Management/DTO/UserLogViewModel.cs
index ba6c604d9..9f63e6b84 100644
--- a/IRaCIS.Core.Application/Service/Management/DTO/UserLogViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Management/DTO/UserLogViewModel.cs
@@ -55,6 +55,8 @@ namespace IRaCIS.Core.Application.ViewModel
 
         public DateTime? EndDate { get; set; }
 
+        public UserTypeEnum? LoginUserTypeEnum { get; set; }
+
         public Guid? UserTypeId { get; set; }
 
         public Guid? UserId { get; set; }
diff --git a/IRaCIS.Core.Application/Service/Management/UserService.cs b/IRaCIS.Core.Application/Service/Management/UserService.cs
index b37b3ef2e..ee13c5afe 100644
--- a/IRaCIS.Core.Application/Service/Management/UserService.cs
+++ b/IRaCIS.Core.Application/Service/Management/UserService.cs
@@ -769,6 +769,7 @@ namespace IRaCIS.Application.Services
                .WhereIf(!string.IsNullOrEmpty(inQuery.LoginUserName), t => t.LoginUser.UserName.Contains(inQuery.LoginUserName!))
                .WhereIf(!string.IsNullOrEmpty(inQuery.LoginFaildName), t => t.LoginFaildName.Contains(inQuery.LoginFaildName!))
                .WhereIf(!string.IsNullOrEmpty(inQuery.IP), t => t.IP.Contains(inQuery.IP!))
+               .WhereIf(inQuery.LoginUserTypeEnum != null, t => t.LoginUser.UserTypeEnum == inQuery.LoginUserTypeEnum)
                .WhereIf(inQuery.UserTypeId != null, t => t.LoginUser.UserTypeId == inQuery.UserTypeId)
 
              .ProjectTo<UserLogView>(_mapper.ConfigurationProvider);