mkm/TaskSystem
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'test' (#4) from zhangwei into master

Browse Source 
Reviewed-on: #4
This commit is contained in:
weiz 2023-09-05 10:25:47 +08:00
commit 1487f5d65d
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/api/controller/VehicleController.php
View File

@ -30,9 +30,9 @@ class VehicleController extends BaseApiController
$selfCar = VehicleRent::field('id')->where('company_id',$this->userInfo['company_id'])->where('status','<>',3)->where('type',1)->count(); $selfCar = VehicleRent::field('id')->where('company_id',$this->userInfo['company_id'])->where('status','<>',3)->where('type',1)->count();
//可在租车辆 //可在租车辆
$doubleRentCar = $villageCompany - $rentCar - $applyCar - $selfCar; $doubleRentCar = $villageCompany - $rentCar - $applyCar - $selfCar;
if($params['num'] > $doubleRentCar ){ // if($params['num'] > $doubleRentCar ){
return $this->fail('数量超过可再租车辆数'); // return $this->fail('数量超过可再租车辆数');
} // }
//查找乙方公司信息 //查找乙方公司信息
$party_b = Company::field('id,company_name,organization_code,master_name,master_phone,master_email,company_type')->where('id',$this->userInfo['company_id'])->find(); $party_b = Company::field('id,company_name,organization_code,master_name,master_phone,master_email,company_type')->where('id',$this->userInfo['company_id'])->find();
if(empty($party_b)) { if(empty($party_b)) {