From 1b108e8d7335d5a5a59dfcf2f4eeef034a53b9b8 Mon Sep 17 00:00:00 2001
From: zhaowc <526854230@qq.com>
Date: 星期五, 06 九月 2024 12:33:06 +0800
Subject: [PATCH] 用户管理页角色问题和密码增加验证问题
---
Wms/WMS.BLL/LogServer/OperationCrServer.cs | 13 +++++--------
1 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/Wms/WMS.BLL/LogServer/OperationCrServer.cs b/Wms/WMS.BLL/LogServer/OperationCrServer.cs
index 253df18..45580a1 100644
--- a/Wms/WMS.BLL/LogServer/OperationCrServer.cs
+++ b/Wms/WMS.BLL/LogServer/OperationCrServer.cs
@@ -27,7 +27,7 @@
{
_userManager = userManager;
}
- public List<OperationDto> GetLogOperationCrList(string menuName, string type, string msg, string startTime, string endTime, int page, int limit, out int count)
+ public async Task<List<OperationDto>> GetLogOperationCrList(string menuName, string type, string msg, string startTime, string endTime, int page, int limit, RefAsync<int> count)
{
try
{
@@ -38,8 +38,7 @@
.AndIF(!string.IsNullOrWhiteSpace(startTime), it => it.CreateTime >= Convert.ToDateTime(startTime))
.AndIF(!string.IsNullOrWhiteSpace(endTime), it => it.CreateTime <= Convert.ToDateTime(endTime).AddDays(1))
.ToExpression();//娉ㄦ剰 杩欎竴鍙� 涓嶈兘灏�
- var total = 0;
- var list = GetAllWhereAsync(item)
+ var list = await GetAllWhereAsync(item)
.LeftJoin<SysDictionary>((it, dic) => it.Type == dic.Id.ToString())
.LeftJoin<SysUserInfor>((it, dic, users) => it.CreateUser == users.Id)
.Select((it, dic, users) => new OperationDto()
@@ -55,10 +54,8 @@
CreateUserName = users.RealName,
})
.OrderByDescending(it => it.CreateTime)
- .ToOffsetPage(page, limit, ref total);
-
- count = total;
- return list.OrderByDescending(m => m.CreateTime).ToList();
+ .ToPageListAsync(page, limit, count);
+ return list;
}
catch (Exception e)
{
@@ -104,7 +101,7 @@
input.Type = (await Db.Queryable<SysDictionary>().FirstAsync(s => s.DictName == input.TypeName && s.IsDel == "0"))?.Id.ToString();
input.CreateUser = _userManager.UserId;
input.CreateTime = DateTime.Now;
- return await Db.Insertable<LogOperationSys>(input).ExecuteCommandAsync();
+ return await Db.Insertable<LogOperationCR>(input).ExecuteCommandAsync();
}
}
}
--
Gitblit v1.8.0