From 1ac2c31898b2a10906c0058b1b62f73f5ea6daf9 Mon Sep 17 00:00:00 2001
From: zhaowc <526854230@qq.com>
Date: 星期四, 29 八月 2024 09:07:44 +0800
Subject: [PATCH] Merge branch 'master' of http://47.95.120.53:8083/r/JC26WMS

---
 Wms/WMS.BLL/SysServer/MenuServer.cs |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/Wms/WMS.BLL/SysServer/MenuServer.cs b/Wms/WMS.BLL/SysServer/MenuServer.cs
index 90a7cd3..4611e36 100644
--- a/Wms/WMS.BLL/SysServer/MenuServer.cs
+++ b/Wms/WMS.BLL/SysServer/MenuServer.cs
@@ -152,7 +152,8 @@
                 exp.And((a, b, c) => a.Level == level);
                 //str += $" and menu1.Level = '{level}'";
             }
-            return await queryAble.Where(exp.ToExpression()).OrderBy((a, b, c) => a.MenuNo).OrderBy((a, b, c) => a.Ord)
+            exp.And((a, b, c) => a.IsDel == "0");
+            return await queryAble.Where(exp.ToExpression()).OrderBy((a, b, c) => SqlFunc.ToInt32(a.MenuNo)).OrderBy((a, b, c) => a.Ord)
                 .Select<FunctionMenuVm>((a, b, c) => new FunctionMenuVm()
                 {
                     Id = a.Id,

--
Gitblit v1.8.0