1

wangxinhui

2025-01-18 a7ceaaa38a4394b82501ca60230e97d25a6871e3

 代码管理/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 =>