|
@@ -61,15 +61,13 @@ public class SysUserService : IDynamicApiController, ITransient
|
|
|
return await _sysUserRep.AsQueryable()
|
|
return await _sysUserRep.AsQueryable()
|
|
|
.LeftJoin<SysOrg>((u, a) => u.OrgId == a.Id)
|
|
.LeftJoin<SysOrg>((u, a) => u.OrgId == a.Id)
|
|
|
.LeftJoin<SysPos>((u, a, b) => u.PosId == b.Id)
|
|
.LeftJoin<SysPos>((u, a, b) => u.PosId == b.Id)
|
|
|
- .LeftJoin<SysUserRole>((u, a, b, c) => u.Id == c.UserId)
|
|
|
|
|
- .LeftJoin<SysRole>((u, a, b, c, d) => c.RoleId == d.Id)
|
|
|
|
|
.Where(u => u.AccountType != AccountTypeEnum.SuperAdmin)
|
|
.Where(u => u.AccountType != AccountTypeEnum.SuperAdmin)
|
|
|
.WhereIF(orgList != null, u => orgList.Contains(u.OrgId))
|
|
.WhereIF(orgList != null, u => orgList.Contains(u.OrgId))
|
|
|
.WhereIF(!string.IsNullOrWhiteSpace(input.Account), u => u.Account.Contains(input.Account))
|
|
.WhereIF(!string.IsNullOrWhiteSpace(input.Account), u => u.Account.Contains(input.Account))
|
|
|
.WhereIF(!string.IsNullOrWhiteSpace(input.RealName), u => u.RealName.Contains(input.RealName))
|
|
.WhereIF(!string.IsNullOrWhiteSpace(input.RealName), u => u.RealName.Contains(input.RealName))
|
|
|
.WhereIF(!string.IsNullOrWhiteSpace(input.Phone), u => u.Phone.Contains(input.Phone))
|
|
.WhereIF(!string.IsNullOrWhiteSpace(input.Phone), u => u.Phone.Contains(input.Phone))
|
|
|
.OrderBy(u => u.OrderNo)
|
|
.OrderBy(u => u.OrderNo)
|
|
|
- .Select((u, a, b, c, d) => new UserOutput
|
|
|
|
|
|
|
+ .Select((u, a, b) => new UserOutput
|
|
|
{
|
|
{
|
|
|
OrgName = a.Name,
|
|
OrgName = a.Name,
|
|
|
PosName = b.Name,
|
|
PosName = b.Name,
|