diff --git a/YiSha.Business/YiSha.Service/OrganizationManage/UserService.cs b/YiSha.Business/YiSha.Service/OrganizationManage/UserService.cs index a40b0c96..5b9c629c 100644 --- a/YiSha.Business/YiSha.Service/OrganizationManage/UserService.cs +++ b/YiSha.Business/YiSha.Service/OrganizationManage/UserService.cs @@ -168,6 +168,10 @@ private Expression> 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 index 13294bf9..1a052f1a 100644 --- 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 ChildrenDepartmentIdList { get; set; }