From 8baeba33d75be5ae6bffbffa3ae3427b3d7891d4 Mon Sep 17 00:00:00 2001
From: hutongqing <hutongqing@hnkhzn.com>
Date: 星期一, 13 一月 2025 10:11:21 +0800
Subject: [PATCH] 1
---
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_SystemRepository/Sys_MenuRepository.cs | 24 ++++++++++++++++++++++--
1 files changed, 22 insertions(+), 2 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 139ac7f..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,6 +45,26 @@
return _menus;
}
+ 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);
+ _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>();
+ });
+ string test = _menus.Serialize();
+ 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();
@@ -63,10 +83,10 @@
//});
if (App.User.IsRoleIdSuperAdmin(App.User.RoleId))
{
- return GetAllMenu();
+ return GetAllPDAMenu();
}
List<int> menuIds = GetPermissions(App.User.RoleId).Select(x => x.MenuId).ToList();
- return GetAllMenu().Where(x => menuIds.Contains(x.MenuId)).ToList();
+ return GetAllPDAMenu().Where(x => menuIds.Contains(x.MenuId)).ToList();
}
public object GetSuperAdminMenu()
--
Gitblit v1.9.3