From 18d1f45193e34e00fc1b6f65b8596ddb29c5267d Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期二, 24 十二月 2024 15:32:43 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn
---
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_SystemService/Sys_MenuService.cs | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_SystemService/Sys_MenuService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_SystemService/Sys_MenuService.cs"
index 82d9289..57fa60c 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_SystemService/Sys_MenuService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_SystemService/Sys_MenuService.cs"
@@ -50,6 +50,16 @@
}
/// <summary>
+ /// 鑾峰彇PDA棣栭〉浠撳簱鏉冮檺
+ /// </summary>
+ /// <returns></returns>
+ public object GetTreeMenuPDAStash(int ParentId)
+ {
+ List<MenuDTO> _menus = BaseDal.GetAllMenuPDA().Where(x => x.ParentId == ParentId).ToList();
+ return _menus;
+ }
+
+ /// <summary>
/// 鏍规嵁瑙掕壊ID鑾峰彇鑿滃崟涓庢潈闄�
/// </summary>
/// <param name="roleId"></param>
@@ -167,7 +177,7 @@
if (menu.MenuId == menu.ParentId)
{
return webResponse.Error($"鐖剁骇id涓嶈兘涓鸿嚜宸�");
- }
+ }
if (BaseDal.QueryFirst(x => x.ParentId == menu.MenuId && menu.ParentId == x.MenuId) != null)
{
return webResponse.Error($"涓嶈兘閫夋嫨姝ょ埗绾d锛岄�夋嫨鐨勭埗绾d涓庡綋鍓嶈彍鍗曞舰鎴愪緷璧栧叧绯�");
@@ -190,7 +200,7 @@
public WebResponseContent DelMenu(int menuId)
{
WebResponseContent webResponse = new WebResponseContent();
- if(BaseDal.QueryFirst(x=>x.ParentId == menuId) != null)
+ if (BaseDal.QueryFirst(x => x.ParentId == menuId) != null)
{
return webResponse = WebResponseContent.Instance.Error("褰撳墠鑿滃崟瀛樺湪瀛愯彍鍗�,璇峰厛鍒犻櫎瀛愯彍鍗�!");
}
--
Gitblit v1.9.3