|
@@ -550,13 +550,13 @@ class Authcompany extends \fast\Authpc
|
|
|
$userRule = $this->getRuleList();
|
|
|
|
|
|
// 必须将结果集转换为数组
|
|
|
- $ruleList = collection(\app\admin\model\PcAuthRule::where('status', 'normal')
|
|
|
- ->field('id,pid as parentId,name as namerule,title as name,path,component,component_name as componentName,icon,status as visible')
|
|
|
+ $ruleList = collection(\app\admin\model\PcAuthRule::field('id,pid as parentId,name as namerule,title as name,path,component,component_name as componentName,icon,status as visible')
|
|
|
->where('type', 'NEQ',3)
|
|
|
->order('weigh', 'desc')
|
|
|
->select())->toArray();
|
|
|
|
|
|
foreach ($ruleList as $k => &$v) {
|
|
|
+ $v['visible'] = $v['visible'] == 'normal' ? true : false;
|
|
|
$v['alwaysShow'] = true;
|
|
|
$v['keepAlive'] = true;
|
|
|
|