|
@@ -55,7 +55,7 @@ class Menu extends Base
|
|
|
if ($this->level == 1) $where[] = ['blevel', 'in', [0, 1, 2]];
|
|
|
else $where[] = ['blevel', 'in', [0, $this->level]];
|
|
|
}
|
|
|
- $roleaction = json_decode($role['action_conllect'],true);
|
|
|
+ $roleaction = is_array($role['action_conllect'])?$role['action_conllect']:json_decode($role['action_conllect'],true);
|
|
|
$data = Db::name("view_menu")
|
|
|
->where($where)
|
|
|
->whereIn('aid', $roleaction)
|