From a5b2a564b7073fcc4b75058ba04aafddad9cbf3d 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: Fri, 28 Jul 2023 07:27:03 +0800
Subject: [PATCH] =?UTF-8?q?:sparkles:=20=E7=94=A8=E6=88=B7=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E6=96=B0=E5=A2=9E=E6=A0=B9=E6=8D=AE=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?id=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ZR.Model/System/Dto/SysUserDto.cs   | 2 +-
 ZR.Service/System/SysUserService.cs | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/ZR.Model/System/Dto/SysUserDto.cs b/ZR.Model/System/Dto/SysUserDto.cs
index d8ba37a..2dc0b95 100644
--- a/ZR.Model/System/Dto/SysUserDto.cs
+++ b/ZR.Model/System/Dto/SysUserDto.cs
@@ -18,7 +18,7 @@ namespace ZR.Model.System.Dto
 
     public class SysUserQueryDto
     {
-        public long UserId { get; set; }
+        public long? UserId { get; set; }
         public string UserName { get; set; }
         public string NickName { get; set; }
         public string Email { get; set; }
diff --git a/ZR.Service/System/SysUserService.cs b/ZR.Service/System/SysUserService.cs
index ee874d4..ff31d26 100644
--- a/ZR.Service/System/SysUserService.cs
+++ b/ZR.Service/System/SysUserService.cs
@@ -43,6 +43,7 @@ namespace ZR.Service
         {
             var exp = Expressionable.Create<SysUser>();
             exp.AndIF(!string.IsNullOrEmpty(user.UserName), u => u.UserName.Contains(user.UserName));
+            exp.AndIF(user.UserId > 0, u => u.UserId == user.UserId);
             exp.AndIF(user.Status != -1, u => u.Status == user.Status);
             exp.AndIF(user.BeginTime != DateTime.MinValue && user.BeginTime != null, u => u.Create_time >= user.BeginTime);
             exp.AndIF(user.EndTime != DateTime.MinValue && user.EndTime != null, u => u.Create_time <= user.EndTime);