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

app/admin/model/system/SystemMenus.php

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