|
|
|
@ -61,7 +61,7 @@ namespace _24Hour.Controllers.system
|
|
|
|
|
[Route("QueryUserlist")] |
|
|
|
|
public async Task<Result> QueryUserlist() |
|
|
|
|
{ |
|
|
|
|
var Unitlist = await _db.Queryable<App_Sys_UserModel>().Where(q => q.IsDeleted == 0 && q.isdeactivate == 0 && q.usertype == 0 && q.unitCode == _userdata.unitCode && q.phone != "admin").ToListAsync(); |
|
|
|
|
var Unitlist = await _db.Queryable<App_Sys_UserModel>().Where(q => q.IsDeleted == 0 && q.isdeactivate == 0 && q.usertype == 0 && q.unitCode == _userdata.unitCode && q.phone != "admin"&& q.usertype == 0).ToListAsync(); |
|
|
|
|
result.IsSucceed = true; |
|
|
|
|
result.result = Unitlist.OrderByDescending(q => q.createtime).ToList(); |
|
|
|
|
return result; |
|
|
|
@ -85,7 +85,7 @@ namespace _24Hour.Controllers.system
|
|
|
|
|
.WhereIF(!UserModel.phone.IsNull(), q => q.phone.Contains(UserModel.phone)) |
|
|
|
|
.WhereIF(!UserModel.duties.IsNull(), q => q.duties.Contains(UserModel.duties)) |
|
|
|
|
.WhereIF(!UserModel.cardId.IsNull(), q => q.cardId.Contains(UserModel.cardId)) |
|
|
|
|
.Where(q => q.IsDeleted == 0 &&q.phone!="admin") |
|
|
|
|
.Where(q => q.IsDeleted == 0 &&q.phone!="admin" && q.usertype == 0) |
|
|
|
|
.ToPageListAsync(UserModel.PageIndex, UserModel.PageSize, totalNumber); |
|
|
|
|
UserModel.RowsCount = totalNumber; |
|
|
|
|
list.ForEach(q => |
|
|
|
|