Browse Source

文书签收管理端查询接口调整,用户信息查询接口调整

master
liujiaqiang 2 years ago
parent
commit
8e1661b420
  1. 4
      24Hour/Controllers/Common/DocumentController.cs
  2. 4
      24Hour/Controllers/system/SystemControllerController.cs

4
24Hour/Controllers/Common/DocumentController.cs

@ -94,8 +94,10 @@ namespace _24Hour.Controllers.Common
.ToPageListAsync(Documentdata.PageIndex, Documentdata.PageSize, totalNumber); .ToPageListAsync(Documentdata.PageIndex, Documentdata.PageSize, totalNumber);
Documentdata.RowsCount = totalNumber; Documentdata.RowsCount = totalNumber;
list.ForEach(q => { list.ForEach(q => {
if(!string.IsNullOrEmpty(q.djsj))
q.djsj = unixStartTime.AddMilliseconds(long.Parse(q.djsj)).ToString("yyyy-MM-dd HH:mm"); q.djsj = unixStartTime.AddMilliseconds(long.Parse(q.djsj)).ToString("yyyy-MM-dd HH:mm");
q.sdsj = unixStartTime.AddMilliseconds(long.Parse(q.sdsj)).ToString("yyyy-MM-dd HH:mm"); if (!string.IsNullOrEmpty(q.sdsj))
q.sdsj = unixStartTime.AddMilliseconds(long.Parse(q.sdsj)).ToString("yyyy-MM-dd HH:mm");
}); });
var data = new QueryResult<App_DocumentModel>(Documentdata, list.OrderByDescending(q => q.sdsj).ToList()); var data = new QueryResult<App_DocumentModel>(Documentdata, list.OrderByDescending(q => q.sdsj).ToList());

4
24Hour/Controllers/system/SystemControllerController.cs

@ -61,7 +61,7 @@ namespace _24Hour.Controllers.system
[Route("QueryUserlist")] [Route("QueryUserlist")]
public async Task<Result> 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.IsSucceed = true;
result.result = Unitlist.OrderByDescending(q => q.createtime).ToList(); result.result = Unitlist.OrderByDescending(q => q.createtime).ToList();
return result; return result;
@ -85,7 +85,7 @@ namespace _24Hour.Controllers.system
.WhereIF(!UserModel.phone.IsNull(), q => q.phone.Contains(UserModel.phone)) .WhereIF(!UserModel.phone.IsNull(), q => q.phone.Contains(UserModel.phone))
.WhereIF(!UserModel.duties.IsNull(), q => q.duties.Contains(UserModel.duties)) .WhereIF(!UserModel.duties.IsNull(), q => q.duties.Contains(UserModel.duties))
.WhereIF(!UserModel.cardId.IsNull(), q => q.cardId.Contains(UserModel.cardId)) .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); .ToPageListAsync(UserModel.PageIndex, UserModel.PageSize, totalNumber);
UserModel.RowsCount = totalNumber; UserModel.RowsCount = totalNumber;
list.ForEach(q => list.ForEach(q =>

Loading…
Cancel
Save