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

app/admin/controller/setting/SystemRole.php

@@ -57,6 +57,7 @@ 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

@@ -117,7 +117,6 @@ class SystemMenus extends BaseModel
     {
         $res = SystemRole::where('id', 'IN', $rules)->field('GROUP_CONCAT(rules) as ids')->find();
         $ruleList = self::where('id', 'IN', $res['ids'])->whereOr('pid', 0)->order('sort DESC')->select();
-        dump($ruleList->toArray());
         return self::tidyMenuTier(false, $ruleList);
     }