优化

huangxiaoqiang

2025-03-04 1b6ccb64675e5262a2f7135697edc7466ffc14bf

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Services/Sys_MenuService.cs

@@ -47,6 +47,23 @@
            return obj;
        }

        public object GetCurrentMenuPhoneActionList()
        {
            object obj = GetMenuActionPhoneList(App.User.RoleId);
            if (obj is IEnumerable<object> list)
            {
                if (list.Any())
                {
                    return obj;
                }
                else
                {
                    return WebResponseContent.Instance.Error("未获取到菜单信息");
                }
            }
            return obj;
        }

        /// <summary>
        /// 根据角色ID获取菜单与权限
        /// </summary>
@@ -54,13 +71,26 @@
        /// <returns></returns>
        public object GetMenuActionList(int roleId)
        {
            if (App.User.IsRoleIdSuperAdmin(roleId))
            {
                return BaseDal.GetSuperAdminMenu();
            }
            return BaseDal.GetMenuByRoleId(roleId);
        }

        /// <summary>
        /// 根据角色ID获取菜单与权限
        /// </summary>
        /// <param name="roleId"></param>
        /// <returns></returns>
        public object GetMenuActionPhoneList(int roleId)
        {
            var allMenu = BaseDal.QueryData(x => (x.Enable == 1 || x.Enable == 2) && x.MenuType == 1 && x.ParentId > 0).OrderByDescending(a => a.OrderNo).ThenByDescending(q => q.ParentId).ToList();

            var menu = allMenu.Select(x => new
            {
                text = x.MenuName,
                url = x.Url,
                icon = x.Icon,
            });
            return menu.ToList();
        }

        public List<MenuDTO> GetUserMenuList(int roleId)
        {
@@ -155,7 +185,7 @@
                    if (menu.MenuId == menu.ParentId)
                    {
                        return webResponse.Error($"父级id不能为自己");
                    } 
                    }
                    if (BaseDal.QueryFirst(x => x.ParentId == menu.MenuId && menu.ParentId == x.MenuId) != null)
                    {
                        return webResponse.Error($"不能选择此父级id，选择的父级id与当前菜单形成依赖关系");
@@ -172,7 +202,6 @@
                webResponse.Error(ex.Message);
            }
            return webResponse;

        }
    }
}
}