1

huangxiaoqiang

2025-05-26 41702c7ce4c88ad70f52d83d153dd4c596ff69d5

 项目代码/WMS/WIDESEA_WMSServer/WIDESEA_Repository/Sys_MenuRepository.cs

@@ -26,13 +26,29 @@

        public List<MenuDTO> GetAllMenu()
        {
            List<Sys_Menu> menus = base.QueryData(x => x.Enable == 1 || x.Enable == 2).OrderByDescending(a => a.OrderNo).ThenByDescending(q => q.ParentId).ToList();
            //List<Sys_Menu> menus = base.QueryData(x => x.Enable == 1 || x.Enable == 2).OrderByDescending(a => a.OrderNo).ThenByDescending(q => q.ParentId).ToList();

            //List<MenuDTO> _menus = _mapper.Map<List<MenuDTO>>(menus);

            //_menus.ForEach(x =>
            //{
            //    x.MenuType ??= 0;
            //    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;
            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 =>
            {
                x.MenuType ??= 0;
                if (!string.IsNullOrEmpty(x.Auth) && x.Auth.Length > 10)
                {
                    try