From 94aa94341027791f36f7f39ef56c804e3c49a232 Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Fri, 25 Oct 2024 11:07:27 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B4=A6=E5=8F=B7=E6=9C=80=E6=9C=89=E4=B8=80?= =?UTF-8?q?=E6=AC=A1=E7=99=BB=E5=BD=95=E6=97=B6=E9=97=B4=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E6=9F=A5=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 | 2 ++ 2 files changed, 8 insertions(+) diff --git a/IRaCIS.Core.Application/Service/Management/DTO/UserModel.cs b/IRaCIS.Core.Application/Service/Management/DTO/UserModel.cs index a4f6938fe..d67de81eb 100644 --- a/IRaCIS.Core.Application/Service/Management/DTO/UserModel.cs +++ b/IRaCIS.Core.Application/Service/Management/DTO/UserModel.cs @@ -165,6 +165,8 @@ namespace IRaCIS.Application.Contracts public string PositionName { get; set; } = String.Empty; public bool IsTestUser { get; set; } + + public DateTime? LastLoginTime { get; set; } } /// @@ -225,6 +227,10 @@ namespace IRaCIS.Application.Contracts public DateTime? EndCreateTime { get; set; } public string? EMail { get; set; } + + public DateTime? BeginLastLoginTime { get; set; } + + public DateTime? EndLastLoginTime { get; set; } } public class UserRoleInfoDTO diff --git a/IRaCIS.Core.Application/Service/Management/UserService.cs b/IRaCIS.Core.Application/Service/Management/UserService.cs index b1985e490..f7348fcb9 100644 --- a/IRaCIS.Core.Application/Service/Management/UserService.cs +++ b/IRaCIS.Core.Application/Service/Management/UserService.cs @@ -461,6 +461,8 @@ namespace IRaCIS.Core.Application.Service .WhereIf(!string.IsNullOrWhiteSpace(inQuery.EMail), t => t.EMail.Contains(inQuery.EMail)) .WhereIf(inQuery.BeginCreateTime != null, t => t.CreateTime >= inQuery.BeginCreateTime) .WhereIf(inQuery.EndCreateTime != null, t => t.CreateTime <= inQuery.EndCreateTime) + .WhereIf(inQuery.BeginLastLoginTime != null, t => t.LastLoginTime >= inQuery.BeginLastLoginTime) + .WhereIf(inQuery.EndLastLoginTime != null, t => t.LastLoginTime <= inQuery.EndLastLoginTime) .WhereIf(inQuery.UserType != null, t => t.UserTypeId == inQuery.UserType) .WhereIf(inQuery.UserState != null, t => t.Status == inQuery.UserState) .WhereIf(inQuery.IsTestUser != null, t => t.IsTestUser == inQuery.IsTestUser)