From 5ab6b36c0c4bd80a31dcdd9f15cc835b7352c4e7 Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期四, 16 一月 2025 11:08:02 +0800
Subject: [PATCH] 1
---
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_SystemRepository/Sys_MenuRepository.cs | 26 +++++++++++++++++++++++++-
1 files changed, 25 insertions(+), 1 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_SystemRepository/Sys_MenuRepository.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_SystemRepository/Sys_MenuRepository.cs"
index da9c152..f49edd5 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_SystemRepository/Sys_MenuRepository.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_SystemRepository/Sys_MenuRepository.cs"
@@ -45,7 +45,7 @@
return _menus;
}
- public List<MenuDTO> GetAllMenuPDA()
+ public List<MenuDTO> GetAllPDAMenu()
{
List<Sys_Menu> menus = base.QueryData(x => (x.Enable == 1 || x.Enable == 2) && x.MenuType == 1).OrderByDescending(a => a.OrderNo).ThenByDescending(q => q.ParentId).ToList();
List<MenuDTO> _menus = _mapper.Map<List<MenuDTO>>(menus);
@@ -65,6 +65,30 @@
return _menus;
}
+ public List<MenuDTO> GetAllMenuPDA()
+ {
+ //List<Sys_Menu> menus = base.QueryData(x => (x.Enable == 1 || x.Enable == 2) && x.MenuType == App.User.MenuType).OrderByDescending(a => a.OrderNo).ThenByDescending(q => q.ParentId).ToList();
+ //List<MenuDTO> _menus = _mapper.Map<List<MenuDTO>>(menus);
+ //_menus.ForEach(x =>
+ //{
+ // if (!string.IsNullOrEmpty(x.Auth) && x.Auth.Length > 10)
+ // {
+ // try
+ // {
+ // x.Actions = x.Auth.DeserializeObject<List<ActionDTO>>();
+ // }
+ // catch { }
+ // }
+ // x.Actions ??= new List<ActionDTO>();
+ //});
+ if (App.User.IsRoleIdSuperAdmin(App.User.RoleId))
+ {
+ return GetAllPDAMenu();
+ }
+ List<int> menuIds = GetPermissions(App.User.RoleId).Select(x => x.MenuId).ToList();
+ return GetAllPDAMenu().Where(x => menuIds.Contains(x.MenuId)).ToList();
+ }
+
public object GetSuperAdminMenu()
{
return GetAllMenu().Select(x =>
--
Gitblit v1.9.3