|
|
@@ -44,7 +44,7 @@ class WorkAction extends Base
|
|
|
$list = $this->whereIn("id",$idArr)->field("id,action_name,menu_id,belong_action")->select();
|
|
|
foreach ($list as &$item){
|
|
|
$meun = $this->GetMenuList($item->menu_id,$belong);
|
|
|
- $item=array_merge($item,$meun);
|
|
|
+ $item=array_merge($item->toArray(),$meun);
|
|
|
$item->actionInfo = $this->GetActionList($item->belong_action,$belong);
|
|
|
}
|
|
|
return $list;
|
