增加查询条件
continuous-integration/drone/push Build is passing Details

Uat_IRC_Net8
hang 2024-12-27 11:43:35 +08:00
parent dba356446e
commit ecdd0fda85
3 changed files with 8 additions and 0 deletions

View File

@ -295,6 +295,11 @@ namespace IRaCIS.Application.Contracts
public DateTime? BeginLastLoginTime { get; set; }
public DateTime? EndLastLoginTime { get; set; }
public DateTime? BeginLastChangePassWordTime { get; set; }
public DateTime? EndLastChangePassWordTime { get; set; }
}
public class UserRoleInfoDTO

View File

@ -479,6 +479,8 @@ namespace IRaCIS.Core.Application.Service
.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.BeginLastChangePassWordTime != null, t => t.LastChangePassWordTime >= inQuery.BeginLastChangePassWordTime)
.WhereIf(inQuery.EndLastChangePassWordTime != null, t => t.LastChangePassWordTime <= inQuery.EndLastChangePassWordTime)
.WhereIf(inQuery.UserType != null, t => t.UserRoleList.Any(t => t.UserTypeId == inQuery.UserType))
.WhereIf(inQuery.UserState != null, t => t.Status == inQuery.UserState)
.WhereIf(inQuery.IsTestUser != null, t => t.IsTestUser == inQuery.IsTestUser)

View File

@ -174,6 +174,7 @@ namespace IRaCIS.Core.Application.ViewModel
[NotDefault]
public Guid SystemUserId { get; set; }
[NotDefault]
public Guid UserTypeId { get; set; }
}