From cd407fe4016b75e41b066557fd228e9a17aaf257 Mon Sep 17 00:00:00 2001 From: weiz Date: Thu, 19 Oct 2023 11:57:38 +0800 Subject: [PATCH 1/2] update --- app/api/controller/VehicleController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/api/controller/VehicleController.php b/app/api/controller/VehicleController.php index c51b75d46..1b16c3c1f 100644 --- a/app/api/controller/VehicleController.php +++ b/app/api/controller/VehicleController.php @@ -390,7 +390,7 @@ class VehicleController extends BaseApiController return $this->fail('非镇街公司不能访问'); } //获取小组服务公司申请信息 - $vehicleContract_pre = VehicleContract::where('company_a_id',$company['id'])->where('status','in','-1,0,1,2')->limit(4)->order('create_time desc')->select()->toArray(); + $vehicleContract_pre = VehicleContract::where('company_a_id',$company['id'])->where('status','in','-1,0,1,2')-where('type','<>',2)->limit(4)->order('create_time desc')->select()->toArray(); $vehicleContract = []; foreach ($vehicleContract_pre as $v) { $vehicleBuy = VehicleBuyRecord::where('contract_id',$v['id'])->findOrEmpty(); From 4339b0265edf6c8a1863eefa3072767fdeb66436 Mon Sep 17 00:00:00 2001 From: weiz Date: Thu, 19 Oct 2023 14:15:02 +0800 Subject: [PATCH 2/2] update --- app/api/controller/VehicleController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/api/controller/VehicleController.php b/app/api/controller/VehicleController.php index 1b16c3c1f..de3532e70 100644 --- a/app/api/controller/VehicleController.php +++ b/app/api/controller/VehicleController.php @@ -390,7 +390,7 @@ class VehicleController extends BaseApiController return $this->fail('非镇街公司不能访问'); } //获取小组服务公司申请信息 - $vehicleContract_pre = VehicleContract::where('company_a_id',$company['id'])->where('status','in','-1,0,1,2')-where('type','<>',2)->limit(4)->order('create_time desc')->select()->toArray(); + $vehicleContract_pre = VehicleContract::where('company_a_id',$company['id'])->where('status','in','-1,0,1,2')->where('type','<>',2)->limit(4)->order('create_time desc')->select()->toArray(); $vehicleContract = []; foreach ($vehicleContract_pre as $v) { $vehicleBuy = VehicleBuyRecord::where('contract_id',$v['id'])->findOrEmpty();