From 1bf2b2e41458074eea0dcc9f11ab97df89c51b20 Mon Sep 17 00:00:00 2001
From: unknown <736250432@qq.com>
Date: Wed, 30 Aug 2023 19:52:12 +0800
Subject: [PATCH] 11

---
 app/api/controller/IndexController.php   | 2 ++
 app/api/controller/VehicleController.php | 6 +++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/api/controller/IndexController.php b/app/api/controller/IndexController.php
index f82fbce3f..106a73128 100755
--- a/app/api/controller/IndexController.php
+++ b/app/api/controller/IndexController.php
@@ -155,6 +155,8 @@ class IndexController extends BaseApiController
                     'user_name' => $party_b_company['master_name'],
                     'user_phone' => $party_b_company['master_phone'],
                 ]);
+            }else{
+                //自有车辆
             }
         }
         return json(['success' => true, 'msg' => '成功']);
diff --git a/app/api/controller/VehicleController.php b/app/api/controller/VehicleController.php
index a1eb72e6c..6e4637a83 100644
--- a/app/api/controller/VehicleController.php
+++ b/app/api/controller/VehicleController.php
@@ -129,8 +129,8 @@ class VehicleController extends BaseApiController
             'town_company_id' => $contract['party_a'],
             'village_company_id' => $village_company['id'],
             'village_company_name' => $village_company['company_name'],
-            'village_company_user' => $village_company['master_phone'],
-            'village_company_phone' => $village_company['id'],
+            'village_company_user' => $village_company['master_name'],
+            'village_company_phone' => $village_company['master_phone'],
             'car_license' => !empty($params) ? $params : '',
             'type' => !empty($params) ? 1 : 0,
             'status' => 0,
@@ -191,7 +191,7 @@ class VehicleController extends BaseApiController
             return $this->fail('获取数据失败');
         }
         //获取镇街公司可租赁车辆列表
-        $cars = VehicleRent::field('id,car_license')->where('company_id',$this->userInfo['company_id'])->where('status',0)->where('type',0)->select();
+        $cars = VehicleRent::field('car_id,car_license')->where('company_id',$this->userInfo['company_id'])->where('status',0)->where('type',0)->select();
         return $this->success('请求成功',[
             'apply' => $data->toArray(),
             'cars' => $cars->toArray()