feat:modify userList for ListFilter and queryParams

liukuo362573 · Jun 22, 2024 · 6ec7256 · 6ec7256
1 parent 5384454
commit 6ec7256
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/YiSha.Business/YiSha.Service/OrganizationManage/UserService.cs b/YiSha.Business/YiSha.Service/OrganizationManage/UserService.cs
@@ -168,6 +168,10 @@ private Expression<Func<UserEntity, bool>> ListFilter(UserListParam param)
         {
             if(param != null)
             {
+                if (param.UserStatus == -1)
+                {
+                    param.UserStatus = null;
+                }
                 if (!string.IsNullOrEmpty(param.EndTime.ParseToString()))
                 {
                     param.EndTime = param.EndTime.Value.Date.Add(new TimeSpan(23, 59, 59));

diff --git a/YiSha.Entity/YiSha.Model/Param/OrganizationManage/UserParam.cs b/YiSha.Entity/YiSha.Model/Param/OrganizationManage/UserParam.cs
@@ -7,12 +7,12 @@ namespace YiSha.Model.Param.OrganizationManage
 {
     public class UserListParam : DateTimeParam
     {
+        [QueryCompareAttribute(Compare = CompareEnum.Contains)]
         public string UserName { get; set; }
-        [QueryCompareAttribute(Compare = CompareEnum.Equals)]
+        [QueryCompareAttribute(Compare = CompareEnum.Contains)]
         public string Mobile { get; set; }
         [QueryCompareAttribute(Compare = CompareEnum.Equals)]
         public int? UserStatus { get; set; }
-
         public long? DepartmentId { get; set; }
         [QueryCompareAttribute(FieldName = "DepartmentId", Compare = CompareEnum.In)]
         public List<long> ChildrenDepartmentIdList { get; set; }