From fcd3ec6ae12bde1c78a32324b3c26a9fa05cc458 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=85=A8=E6=A0=88=E5=B0=8F=E5=AD=A6=E7=94=9F?= <1518079521@qq.com> Date: Sat, 19 Apr 2025 10:55:19 +0800 Subject: [PATCH] Update CoreMenuService.php --- .../app/service/core/menu/CoreMenuService.php | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/niucloud/app/service/core/menu/CoreMenuService.php b/niucloud/app/service/core/menu/CoreMenuService.php index d9e1132cf..2b1455812 100644 --- a/niucloud/app/service/core/menu/CoreMenuService.php +++ b/niucloud/app/service/core/menu/CoreMenuService.php @@ -92,15 +92,17 @@ class CoreMenuService extends BaseCoreService if (isset($addon_admin_tree['delete'])) unset($addon_admin_tree['delete']); if (isset($addon_site_tree['delete'])) unset($addon_site_tree['delete']); - + $menu_list = []; + if (!empty($addon_admin_tree)) { + $menu_list = array_merge($menu_list, $this->loadMenu($addon_admin_tree, "admin", $addon)); + } if (!empty($addon_site_tree)) { - $admin_menu = $this->loadMenu($addon_admin_tree, "admin", $addon); - $site_menu = $this->loadMenu($addon_site_tree, "site", $addon); - $this->deleteByAddon($addon, false); - if(!empty($site_menu)) - { - $this->install(array_merge($admin_menu, $site_menu)); - } + $menu_list = array_merge($menu_list, $this->loadMenu($addon_site_tree, "site", $addon)); + } + $this->deleteByAddon($addon, false); + if(!empty($menu_list)) + { + $this->install($menu_list); } return true;