|
@@ -152,7 +152,7 @@ class OaController extends BaseController
|
|
|
|
|
|
$userData = $request->userData->toArray();
|
|
|
$service = new OaService($userData);
|
|
|
- list($status,$data) = $service->oaOrderDetail($request->all(),$user);
|
|
|
+ list($status,$data) = $service->oaOrderDetail($request->all(),$userData);
|
|
|
|
|
|
if($status){
|
|
|
return $this->json_return(200,'',$data);
|
|
@@ -166,7 +166,7 @@ class OaController extends BaseController
|
|
|
|
|
|
$userData = $request->userData->toArray();
|
|
|
$service = new OaService($userData);
|
|
|
- list($status,$data) = $service->oaCheck($request->all(),$user,$request);
|
|
|
+ list($status,$data) = $service->oaCheck($request->all(),$userData,$request);
|
|
|
|
|
|
if($status){
|
|
|
return $this->json_return(200,'',$data);
|
|
@@ -211,7 +211,7 @@ class OaController extends BaseController
|
|
|
|
|
|
$userData = $request->userData->toArray();
|
|
|
$service = new OaService($userData);
|
|
|
- list($status,$data) = $service->oaOrderState($request->all(),$user);
|
|
|
+ list($status,$data) = $service->oaOrderState($request->all(),$userData);
|
|
|
|
|
|
if($status){
|
|
|
return $this->json_return(200,'',$data);
|
|
@@ -256,7 +256,7 @@ class OaController extends BaseController
|
|
|
|
|
|
$userData = $request->userData->toArray();
|
|
|
$service = new OaService($userData);
|
|
|
- list($status,$data) = $service->oaCheckMove($request,$user);
|
|
|
+ list($status,$data) = $service->oaCheckMove($request,$userData);
|
|
|
|
|
|
if($status){
|
|
|
return $this->json_return(200,'',$data);
|