From c584c03da2fdb719fed70255addd6b54fbd7f284 Mon Sep 17 00:00:00 2001
From: pangwenpeng <17302161021@163.com>
Date: Thu, 30 May 2024 15:54:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Model/Dto/SystemConfigurationDto/UserDto.cs      | 12 ++----------
 langguanApi/Service/UserService.cs                   | 12 +++---------
 2 files changed, 5 insertions(+), 19 deletions(-)

diff --git a/langguanApi/Model/Dto/SystemConfigurationDto/UserDto.cs b/langguanApi/Model/Dto/SystemConfigurationDto/UserDto.cs
index b836ffd..e532a7e 100644
--- a/langguanApi/Model/Dto/SystemConfigurationDto/UserDto.cs
+++ b/langguanApi/Model/Dto/SystemConfigurationDto/UserDto.cs
@@ -45,13 +45,9 @@ namespace langguanApi.Model.Dto.SystemConfigurationDto
     public class UserQueryDto
     {
         /// <summary>
-        /// 用户名
+        /// 关键字查询，可根据userName,Tel,Email
         /// </summary>
-        public string Username { get; set; } = "";
-        /// <summary>
-        /// 手机号
-        /// </summary>
-        public string Tel { get; set; } = "";
+        public string key { get; set; } = "";
         /// <summary>
         /// 当前条数
         /// </summary>
@@ -91,10 +87,6 @@ namespace langguanApi.Model.Dto.SystemConfigurationDto
         /// 联系方式
         /// </summary>
         public string Tel { get; set; }
-        /// <summary>
-        /// 是否管理员  0否  1是
-        /// </summary>
-        public string IsAdmin { get; set; }
     }
    
 
diff --git a/langguanApi/Service/UserService.cs b/langguanApi/Service/UserService.cs
index a535afa..8d5ca4e 100644
--- a/langguanApi/Service/UserService.cs
+++ b/langguanApi/Service/UserService.cs
@@ -170,13 +170,9 @@ namespace langguanApi.Service
             {
                 #region 组织查询条件
                 Expression<Func<UserEntity, bool>> exp = filter => filter.IsDelete == false;
-                if (!string.IsNullOrEmpty(input.Username))
+                if (!string.IsNullOrEmpty(input.key))
                 {
-                    exp = filter => filter.Username.Contains(input.Username);
-                }
-                if (!string.IsNullOrEmpty(input.Tel))
-                {
-                    exp = filter => filter.Phone.Contains(input.Tel);
+                    exp = filter => filter.Username.Contains(input.key)|| filter.Phone.Contains(input.key)|| filter.Email.Contains(input.key);
                 }
                 #endregion
                 #region 获取数据
@@ -191,8 +187,6 @@ namespace langguanApi.Service
                 }
                 var roleList = await _roleService.GetRoleListByIds(result.Select(s => s.RoleId).ToList());//根据角色Id获取角色信息
                 #endregion
-                //md5解密
-                //var password = StringHelper.MD5Decrypt32(item.Password);
                 #region 组装返回数据
                 foreach (var item in result)
                 {
@@ -221,7 +215,7 @@ namespace langguanApi.Service
             {
                 _logger.LogInformation($"获取用户列表参数：userQuery:{Newtonsoft.Json.JsonConvert.SerializeObject(input)}");
             }
-            return new ApiResult { code = 0, data = list };
+            return new ApiResult { code = 0, data = list,msg="获取信息成功" };
         }
 
         /// <summary>