From 0464969366317154fdbb51e106ca778b855bdd08 Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期六, 17 八月 2024 15:45:28 +0800
Subject: [PATCH] Merge branch 'master' into wxw

---
 Wms/WMS.BLL/SysServer/RBACServer.cs |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/Wms/WMS.BLL/SysServer/RBACServer.cs b/Wms/WMS.BLL/SysServer/RBACServer.cs
index 9b1ed93..c5694d4 100644
--- a/Wms/WMS.BLL/SysServer/RBACServer.cs
+++ b/Wms/WMS.BLL/SysServer/RBACServer.cs
@@ -66,6 +66,7 @@
                            .LeftJoin<SysRoles>((a, b) => a.RoleNo == b.RoleNo)
                            .LeftJoin<SysFunctionMenu>((a, b, c) => a.MenuNo == c.MenuNo)
                            .Where((a, b, c) => a.Id == id && a.IsDel == "0")
+                            .OrderBy((a, b, c) => SqlFunc.ToInt32(a.MenuNo)).OrderBy((a, b, c) => c.Ord)
                            .Select<RoleRightDto>()
                            .ToListAsync();
         }

--
Gitblit v1.8.0