From 93af53d81598286f34d50778507209e52c1491e3 Mon Sep 17 00:00:00 2001 From: unknown <736250432@qq.com> Date: Fri, 1 Sep 2023 15:55:47 +0800 Subject: [PATCH 1/2] update --- app/adminapi/controller/contract/VehicleContractController.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/adminapi/controller/contract/VehicleContractController.php b/app/adminapi/controller/contract/VehicleContractController.php index 62b463a17..beef4372e 100644 --- a/app/adminapi/controller/contract/VehicleContractController.php +++ b/app/adminapi/controller/contract/VehicleContractController.php @@ -79,6 +79,9 @@ class VehicleContractController extends BaseAdminController $where[] = ['contract_no','like','%'.$param['contract_no'].'%']; } if(isset($param['status']) && in_array($param['status'],[0,1])){ + if($param['status'] == 1){ + $where[] = ['status','in', '1,2,3']; + } $where[] = ['status','=', $param['status']]; }else{ $where[] = ['status','in', '0,1,2,3']; From 2adb1dd1fff4a899acdfe346e7be3ed5ceb45608 Mon Sep 17 00:00:00 2001 From: unknown <736250432@qq.com> Date: Fri, 1 Sep 2023 15:58:26 +0800 Subject: [PATCH 2/2] update --- app/adminapi/controller/contract/VehicleContractController.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/adminapi/controller/contract/VehicleContractController.php b/app/adminapi/controller/contract/VehicleContractController.php index beef4372e..c37d01ef2 100644 --- a/app/adminapi/controller/contract/VehicleContractController.php +++ b/app/adminapi/controller/contract/VehicleContractController.php @@ -81,8 +81,9 @@ class VehicleContractController extends BaseAdminController if(isset($param['status']) && in_array($param['status'],[0,1])){ if($param['status'] == 1){ $where[] = ['status','in', '1,2,3']; + }else{ + $where[] = ['status','=', $param['status']]; } - $where[] = ['status','=', $param['status']]; }else{ $where[] = ['status','in', '0,1,2,3']; }