From 2ae5aa151f7b40a082e34aa7ed22b4b64edd1d3c Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期三, 11 六月 2025 17:13:56 +0800
Subject: [PATCH] 修改堆垛机通讯协议及交互逻辑
---
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_SystemService/Sys_MenuService.cs | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 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 de5c9f2..82d9289 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"
@@ -21,6 +21,8 @@
{
private readonly IUnitOfWorkManage _unitOfWorkManage;
+ public ISys_MenuRepository Repository => BaseDal;
+
public Sys_MenuService(ISys_MenuRepository BaseDal, IUnitOfWorkManage unitOfWorkManage) : base(BaseDal)
{
_unitOfWorkManage = unitOfWorkManage;
@@ -70,6 +72,16 @@
}
List<int> menuIds = BaseDal.GetPermissions(roleId).Select(x => x.MenuId).ToList();
return BaseDal.GetAllMenu().Where(x => menuIds.Contains(x.MenuId)).ToList();
+ }
+
+ public List<MenuDTO> GetUserMenuListPDA(int roleId)
+ {
+ if (App.User.IsRoleIdSuperAdmin(roleId))
+ {
+ return BaseDal.GetAllMenuPDA();
+ }
+ List<int> menuIds = BaseDal.GetPermissions(roleId).Select(x => x.MenuId).ToList();
+ return BaseDal.GetAllMenuPDA().Where(x => menuIds.Contains(x.MenuId)).ToList();
}
public List<ActionDTO> GetActions(int menuId, List<ActionDTO> menuActions, List<Permissions> permissions, int roleId)
@@ -133,7 +145,6 @@
Sys_Menu sysMenu = BaseDal.QueryFirst(x => x.TableName == menu.TableName);
if (sysMenu != null)
{
- sysMenu.MenuType ??= 0;
if (sysMenu.MenuType == menu.MenuType)
{
if ((menu.MenuId > 0 && sysMenu.MenuId != menu.MenuId)
--
Gitblit v1.9.3