From 5d03e942416d07962409f7d3230097463fee63fa Mon Sep 17 00:00:00 2001
From: bklLiudl <673013083@qq.com>
Date: 星期三, 17 七月 2024 15:58:26 +0800
Subject: [PATCH] Merge branch 'master' into Liudl
---
Wms/WMS.BLL/SysServer/RoleRightServer.cs | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/Wms/WMS.BLL/SysServer/RoleRightServer.cs b/Wms/WMS.BLL/SysServer/RoleRightServer.cs
index 63cc975..b2610ef 100644
--- a/Wms/WMS.BLL/SysServer/RoleRightServer.cs
+++ b/Wms/WMS.BLL/SysServer/RoleRightServer.cs
@@ -25,16 +25,14 @@
/// <summary>
/// 渚濊禆娉ㄥ叆
/// </summary>
- public IRoleRightRepository _rolerights { get; set; }
private static readonly SqlSugarScope Db = DataContext.Db;
private readonly UserManager _userManager;
/// <summary>
/// 鏋勯�犲嚱鏁�
/// </summary>
/// <param name="roles"></param>
- public RoleRightServer(IRoleRightRepository rolerights, UserManager userManager)
+ public RoleRightServer(UserManager userManager)
{
- _rolerights = rolerights;
_userManager = userManager;
}
@@ -59,6 +57,7 @@
.LeftJoin<SysRoles>((a, b, c) => a.RoleNo == c.RoleNo)
.Where((a, b, c) => a.IsDel == "0" && b.IsDel == "0" && c.IsDel == "0")
.Where((a, b, c) => a.RoleNo == modUser.RoleNo)
+ .OrderBy((a, b, c) => b.Ord) //.OrderBy((a, b, c) => SqlFunc.ToInt32(a.MenuNo))
.Select<RoleRightDto>()
.ToListAsync();
}
--
Gitblit v1.8.0