wenyongda/ZrAdminNetCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix 用户列表查询报错

Browse Source
This commit is contained in:
不做码农 2021-12-20 16:16:43 +08:00
parent 26e74ff2ff
commit a67d7d2184
1 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
ZR.Repository/System/SysUserRepository.cs
View File

@ -1,4 +1,5 @@
using Infrastructure.Attribute; using Infrastructure.Attribute;
using Infrastructure.Extensions;
using SqlSugar; using SqlSugar;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
@ -21,23 +22,20 @@ namespace ZR.Repository.System
/// <returns></returns> /// <returns></returns>
public PagedInfo<SysUser> SelectUserList(SysUser user, PagerInfo pager) 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>() var query = Context.Queryable<SysUser>()
.LeftJoin<SysDept>((user, dept) => user.DeptId == dept.DeptId) .LeftJoin<SysDept>((u, dept) => u.DeptId == dept.DeptId)
.Where(exp.ToExpression()) .WhereIF(!string.IsNullOrEmpty(user.UserName), u => u.UserName.Contains(user.UserName))
.Select((user, dept) => new SysUser .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, DeptName = dept.DeptName,
}) });
.OrderBy((user) => user.UserId);
return query.ToPage(pager); return query.ToPage(pager);
} }