|
|
@@ -148,34 +148,34 @@ class SystemMenus extends BaseModel
|
|
|
if ($adminAuth === null) $adminAuth = $adminFilter == true ? SystemAdmin::activeAdminAuthOrFail() : [];//当前登录用户的菜单
|
|
|
foreach ($menusList as $k => $menu) {
|
|
|
$menu = $menu->getData();
|
|
|
- if ($pid == 21) {
|
|
|
- dump($menu['id']);
|
|
|
- dump($menu['pid']);
|
|
|
- dump($menu['menu_name']);
|
|
|
- }
|
|
|
+// if ($pid == 21) {
|
|
|
+// dump($menu['id']);
|
|
|
+// dump($menu['pid']);
|
|
|
+// dump($menu['menu_name']);
|
|
|
+// }
|
|
|
if ($menu['pid'] == $pid) {
|
|
|
- if ($pid == 21) {
|
|
|
- dump('s');
|
|
|
- }
|
|
|
+// if ($pid == 21) {
|
|
|
+// dump('s');
|
|
|
+// }
|
|
|
unset($menusList[$k]);
|
|
|
$params = json_decode($menu['params'], true);//获取参数
|
|
|
- if ($pid == 21) {
|
|
|
- dump($params);
|
|
|
- }
|
|
|
+// if ($pid == 21) {
|
|
|
+// dump($params);
|
|
|
+// }
|
|
|
$authName = self::getAuthName($menu['action'], $menu['controller'], $menu['module'], $params);// 按钮链接
|
|
|
- if ($pid == 21) {
|
|
|
- dump($authName);
|
|
|
- }
|
|
|
+// if ($pid == 21) {
|
|
|
+// dump($authName);
|
|
|
+// }
|
|
|
if ($pid != 0 && $adminFilter && in_array($authName, $allAuth) && (!in_array($authName, $adminAuth) || !array_key_exists($menu['id'], $adminAuth))) continue;
|
|
|
$menu['child'] = self::tidyMenuTier($adminFilter, $menusList, $menu['id']);
|
|
|
- if ($pid == 21) {
|
|
|
- dump($menu['child']);
|
|
|
- }
|
|
|
+// if ($pid == 21) {
|
|
|
+// dump($menu['child']);
|
|
|
+// }
|
|
|
if ($pid != 0 && !count($menu['child']) && !$menu['controller'] && !$menu['action']) continue;
|
|
|
$menu['url'] = !count($menu['child']) ? Url::buildUrl($menu['module'] . '/' . $menu['controller'] . '/' . $menu['action'], $params) : 'javascript:void(0);';
|
|
|
- if ($pid == 21) {
|
|
|
- dump($menu['url']);
|
|
|
- }
|
|
|
+// if ($pid == 21) {
|
|
|
+// dump($menu['url']);
|
|
|
+// }
|
|
|
if ($pid == 0 && !count($menu['child'])) continue;
|
|
|
$navList[] = $menu;
|
|
|
}
|
Kirin