pull/269678/MERGE
Karson 2017-04-18 08:45:59 +08:00
parent 725782cf7b
commit 94e7615dec
1 changed files with 2 additions and 1 deletions

View File

@ -219,7 +219,7 @@ class Auth extends \fast\Auth
{ {
if (stripos($k, '/') === false) if (stripos($k, '/') === false)
{ {
$url = '/admin/' . $k; $url = '/' . $this->request->module() . '/' . $k;
} }
else else
{ {
@ -250,6 +250,7 @@ class Auth extends \fast\Auth
$select_id = 0; $select_id = 0;
$dashboard = rtrim(url('dashboard/'), '/'); $dashboard = rtrim(url('dashboard/'), '/');
$dashboard = stripos($dashboard, 'index.php') !== FALSE ? substr($dashboard, stripos($dashboard, 'index.php') + 9) : $dashboard;
// 必须将结果集转换为数组 // 必须将结果集转换为数组
$ruleList = collection(model('AuthRule')->where('ismenu', 1)->order('weigh', 'desc')->cache("__menu__")->select())->toArray(); $ruleList = collection(model('AuthRule')->where('ismenu', 1)->order('weigh', 'desc')->cache("__menu__")->select())->toArray();
foreach ($ruleList as $k => &$v) foreach ($ruleList as $k => &$v)