yanghongwei
/
lg_backend
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

master_sxs_new #1

Merged
yanghongwei merged 16 commits from master_sxs_new into master 2024-05-30 14:02:49 +00:00
Conversation 0 Commits 16 Files Changed 8 +5 -19
2 changed files with 5 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit c584c03da2 - Show all commits

12
langguanApi/Model/Dto/SystemConfigurationDto/UserDto.cs
View File

@ -45,13 +45,9 @@ namespace langguanApi.Model.Dto.SystemConfigurationDto
public class UserQueryDto public class UserQueryDto
{ {
/// <summary> /// <summary>
/// 用户名 /// 关键字查询，可根据userName,Tel,Email
/// </summary> /// </summary>
public string Username { get; set; } = ""; public string key { get; set; } = "";
/// <summary>
/// 手机号
/// </summary>
public string Tel { get; set; } = "";
/// <summary> /// <summary>
/// 当前条数 /// 当前条数
/// </summary> /// </summary>
@ -91,10 +87,6 @@ namespace langguanApi.Model.Dto.SystemConfigurationDto
/// 联系方式 /// 联系方式
/// </summary> /// </summary>
public string Tel { get; set; } public string Tel { get; set; }
/// <summary>
/// 是否管理员 0否 1是
/// </summary>
public string IsAdmin { get; set; }
} }

12
langguanApi/Service/UserService.cs
View File

@ -170,13 +170,9 @@ namespace langguanApi.Service
{ {
#region 组织查询条件 #region 组织查询条件
Expression<Func<UserEntity, bool>> exp = filter => filter.IsDelete == false; 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); exp = filter => filter.Username.Contains(input.key)|| filter.Phone.Contains(input.key)|| filter.Email.Contains(input.key);
}
if (!string.IsNullOrEmpty(input.Tel))
{
exp = filter => filter.Phone.Contains(input.Tel);
} }
#endregion #endregion
#region 获取数据 #region 获取数据
@ -191,8 +187,6 @@ namespace langguanApi.Service
} }
var roleList = await _roleService.GetRoleListByIds(result.Select(s => s.RoleId).ToList());//根据角色Id获取角色信息 var roleList = await _roleService.GetRoleListByIds(result.Select(s => s.RoleId).ToList());//根据角色Id获取角色信息
#endregion #endregion
//md5解密
//var password = StringHelper.MD5Decrypt32(item.Password);
#region 组装返回数据 #region 组装返回数据
foreach (var item in result) foreach (var item in result)
{ {
@ -221,7 +215,7 @@ namespace langguanApi.Service
{ {
_logger.LogInformation($"获取用户列表参数：userQuery:{Newtonsoft.Json.JsonConvert.SerializeObject(input)}"); _logger.LogInformation($"获取用户列表参数：userQuery:{Newtonsoft.Json.JsonConvert.SerializeObject(input)}");
} }
return new ApiResult { code = 0, data = list }; return new ApiResult { code = 0, data = list,msg="获取信息成功" };
} }
/// <summary> /// <summary>