ad

app/admin/model/AdminMenu.php

@@ -37,6 +37,6 @@ class AdminMenu extends Base
   public static function GetAction($action){
     	return self::name("view_menu")
     	->where(['aid'=>$action])
-    	->column("id parent_id,menu_name parent_name,cname menu_name,cname menu_id,action_name,aid action_id");
+    	->column("id parent_id,menu_name parent_name,cname menu_name,cid menu_id,action_name,aid action_id");
     }
 }

app/bug/model/WorkAction.php

@@ -42,12 +42,13 @@ class WorkAction extends Base
     
     public function GetTreeActionByIdArr($idArr,$belong=0){
     	$list = $this->whereIn("id",$idArr)->field("id,action_name,menu_id,belong_action")->select();
-    	foreach ($list as &$item){
+    	$temp=[];
+    	foreach ($list as $item){
     		$meun = $this->GetMenuList($item->menu_id,$belong);
-    		$item->actionInfo = $this->GetActionList($item->belong_action,$belong);
-    		$item=array_merge($item->toArray(),$meun);
+    		$item->belong_action_info = $this->GetActionList($item->belong_action,$belong);
+		    $temp[]=array_merge($item->toArray(),$meun);
     	}
-    	return $list;
+    	return $temp;
     }
     
     public function GetMenuList($menuid,$belong){
@@ -67,18 +68,18 @@ class WorkAction extends Base
     }
     
     public function GetActionList($action,$belong){
-        	$action=[];
+        	$act=[];
             switch ($belong){
             	case 1:
-            		$menu=\app\admin\model\AdminMenu::GetAction($action);
+            		$act=\app\admin\model\AdminMenu::GetAction($action);
             		break;
             		case 2:
-            		$menu=\app\cxinv\model\AdminMenu::GetAction($action);
+            		$act=\app\cxinv\model\AdminMenu::GetAction($action);
             		break;
             		case 3:
-            		$menu=\app\cxinv\model\AdminMenu::GetAction($action);
+            		$act=\app\cxinv\model\AdminMenu::GetAction($action);
             		break;
             }
-            return$action;
+            return$act;
     }
 }

app/cxinv/model/AdminMenu.php

@@ -34,6 +34,6 @@ class AdminMenu extends Base
     public static function GetAction($action){
     	return self::name('view_menu')
     	->where(['aid'=>$action])
-    	->column('id parent_id,menu_name parent_name,cname menu_name,cname menu_id,action_name,aid action_id');
+    	->column('id parent_id,menu_name parent_name,cname menu_name,cid menu_id,action_name,aid action_id');
     }
 }