Merge branch 'master' of http://git.liuniu946.com/Kirin/mccs

app/admin/controller/setting/SystemRole.php

@@ -57,7 +57,6 @@ class SystemRole extends AuthController
 //            dump($this->adminInfo['level']);
 //        }
         $menus = $this->adminInfo['level'] == 0 ? SystemMenus::ruleList() : SystemMenus::rolesByRuleList($this->adminInfo['roles']);
-        dump($menus);
         $this->assign(['menus' => json($menus)->getContent(), 'saveUrl' => Url::buildUrl('save')]);
         $this->assign('type',$type);
         return $this->fetch();

app/admin/model/system/SystemMenus.php

@@ -149,13 +149,28 @@ class SystemMenus extends BaseModel
         foreach ($menusList as $k => $menu) {
             $menu = $menu->getData();
             if ($menu['pid'] == $pid) {
+                if ($pid == 21) {
+                    dump('s');
+                }
                 unset($menusList[$k]);
                 $params = json_decode($menu['params'], true);//获取参数
+                if ($pid == 21) {
+                    dump($params);
+                }
                 $authName = self::getAuthName($menu['action'], $menu['controller'], $menu['module'], $params);// 按钮链接
+                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 != 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 == 0 && !count($menu['child'])) continue;
                 $navList[] = $menu;
             }
@@ -199,8 +214,8 @@ class SystemMenus extends BaseModel
         $p = [];
         foreach ($params as $key => $param) {
             $p[] = $key;
-            if(!is_array($param))
-            $p[] = $param;
+            if (!is_array($param))
+                $p[] = $param;
         }
         return implode('/', $p);
     }