From a67d7d218446a833dbd65a856e2edd3f075a96e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=8D=E5=81=9A=E7=A0=81=E5=86=9C?= <599854767@qq.com>
Date: Mon, 20 Dec 2021 16:16:43 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E7=94=A8=E6=88=B7=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ZR.Repository/System/SysUserRepository.cs | 26 +++++++++++------------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/ZR.Repository/System/SysUserRepository.cs b/ZR.Repository/System/SysUserRepository.cs
index 4b94004..57423c1 100644
--- a/ZR.Repository/System/SysUserRepository.cs
+++ b/ZR.Repository/System/SysUserRepository.cs
@@ -1,4 +1,5 @@
 using Infrastructure.Attribute;
+using Infrastructure.Extensions;
 using SqlSugar;
 using System;
 using System.Collections.Generic;
@@ -21,23 +22,20 @@ namespace ZR.Repository.System
         /// <returns></returns>
         public PagedInfo<SysUser> SelectUserList(SysUser user, PagerInfo pager)
         {
-            var exp = Expressionable.Create<SysUser>();
-            exp.AndIF(!string.IsNullOrEmpty(user.UserName), it => it.UserName.Contains(user.UserName));
-            exp.AndIF(!string.IsNullOrEmpty(user.Status), it => it.Status == user.Status);
-            exp.AndIF(user.BeginTime != DateTime.MinValue && user.BeginTime != null, it => it.Create_time >= user.BeginTime);
-            exp.AndIF(user.EndTime != DateTime.MinValue && user.BeginTime != null, it => it.Create_time <= user.EndTime);
-            exp.AndIF(user.DeptId != 0, it => it.DeptId == user.DeptId);
-            exp.And(user => user.DelFlag == "0");
-            
             var query = Context.Queryable<SysUser>()
-                .LeftJoin<SysDept>((user, dept) => user.DeptId == dept.DeptId)
-                .Where(exp.ToExpression())
-                .Select((user, dept) => new SysUser
+                .LeftJoin<SysDept>((u, dept) => u.DeptId == dept.DeptId)
+                .WhereIF(!string.IsNullOrEmpty(user.UserName), u => u.UserName.Contains(user.UserName))
+                .WhereIF(!string.IsNullOrEmpty(user.Status), u => u.Status == user.Status)
+                .WhereIF(user.BeginTime != DateTime.MinValue && user.BeginTime != null, u => u.Create_time >= user.BeginTime)
+                .WhereIF(user.EndTime != DateTime.MinValue && user.EndTime != null, u => u.Create_time <= user.EndTime)
+                .WhereIF(!user.Phonenumber.IsEmpty(), u => u.Phonenumber == user.Phonenumber)
+                .WhereIF(user.DeptId != 0, u => u.DeptId == user.DeptId)
+                .Where(u => u.DelFlag == "0")
+                .Select((u, dept) => new SysUser
                 {
-                    UserId = user.UserId.SelectAll(),
+                    UserId = u.UserId.SelectAll(),
                     DeptName = dept.DeptName,
-                })
-                .OrderBy((user) => user.UserId);
+                });
 
             return query.ToPage(pager);
         }