增加搜索条件

2024-05-15 16:35:57 +08:00
parent 6b807f419b
commit bd9d78622f
2 changed files with 3 additions and 0 deletions
@@ -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; }
@@ -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);