1

app/Http/Controllers/Api/PurchaseOrderController.php

@@ -63,7 +63,8 @@ class PurchaseOrderController extends BaseController
     public function purchaseOrderList(Request $request)
     {
         $service = new PurchaseOrderService();
-        $userData = $request->userData->toArray();
+        if(is_array($request->userData)) $userData = $request->userData;
+        else $userData = $request->userData->toArray();
         list($status,$data) = $service->getList($request->all(),$userData);
 
         if($status){

app/Service/OaService.php

@@ -463,7 +463,7 @@ class OaService extends Service
     }
 
 
-    public function oaCommon($menu_id, $param, $sort = 1, $parent_id = 0)
+    public function oaCommon($menu_id, $param, $sort = 1, $parent_id = 0,$user='')
     {
         $request = request();
         foreach ($param as $k => $v) {
@@ -472,7 +472,7 @@ class OaService extends Service
         $all = $request->all();
         if (!isset($all['order_number'])) $request->merge($param);
 //        $request->merge($param);
-        $detail = $this->oaGetData($menu_id, $request);
+        $detail = $this->oaGetData($menu_id, $request,$user);
         $oa_id = Oa::where('menu_id', $menu_id)->where('channel',$this->user['depart_top'][0]['depart_id'])->where('del_time', 0)->value('id');
         $parent_ids = [$parent_id, 0];
 //        var_dump($parent_ids);
@@ -562,7 +562,7 @@ class OaService extends Service
             switch ($state) {
                 case 1:
                     $sort = $detail['sort'] + 1;
-                    list($employee_ids, $oa_sub_id) = $this->oaCommon($oaOrder->menu_id, ['order_number' => $oaOrder->order_no], $sort, $detail['oa_sub_id']);
+                    list($employee_ids, $oa_sub_id) = $this->oaCommon($oaOrder->menu_id, ['order_number' => $oaOrder->order_no], $sort, $detail['oa_sub_id'],$user);
 //                    var_dump($employee_ids);
 //                    var_dump($oa_sub_id);die;
                     if (empty($employee_ids)) {
@@ -653,9 +653,22 @@ class OaService extends Service
     }
 
 
-    public function oaGetData($menu_id, $request)
+    public function oaGetData($menu_id, $request,$user='')
     {
+
         $api = SysMenu::where('id', $menu_id)->value('api');
+        $param =  SysMenu::where('id', $menu_id)->value('api_params');
+        if(!empty($param)){
+            $param =  json_decode($param,true);
+            $param['state'] = null;
+            $param['menu_id'] = $menu_id;
+            $param['id'] = null;
+            $request->userData = $user;
+            $request->merge($param);
+//            foreach ($param as $k=>$v){
+//                $request->set($k,$v);
+//            }
+        }
         $path = $this->getMenu();
         $control = '\\' . $path[$api]["controller"];
         $act = $path[$api]["act"];