From 1bdff4b3ba2c338fdf815b9e02ea15bfeb6e3ad0 Mon Sep 17 00:00:00 2001
From: hwh <332078369@qq.com>
Date: 星期一, 22 七月 2024 17:00:17 +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