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

Merge pull request 'update' (#76) from zhangwei into master

Browse Source 
Reviewed-on: http://git.excellentkk.cn/mkm/TaskSystem/pulls/76
This commit is contained in:
wei1990 2023-08-31 17:59:16 +08:00
commit 33fe487eec
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/adminapi/controller/contract/VehicleContractController.php
View File

@ -78,12 +78,14 @@ class VehicleContractController extends BaseAdminController
if(isset($param['contract_no'])){
$where[] = ['contract_no','like','%'.$param['contract_no'].'%'];
}
if(isset($param['status'])){
$where[] = ['status','=', $param['contract_no']];
if(isset($param['status']) && in_array($param['status'],[0,1])){
$where[] = ['status','=', $param['status']];
}else{
$where[] = ['status','in', '0,1'];
}
$pageNo = !empty($param['page_no']) ? $param['page_no'] : 1;
$pageSize = !empty($param['page_size']) ? $param['page_size'] : 15;
$data = VehicleContract::where($where)->where('status','in','0,1')
$data = VehicleContract::where($where)
->page($pageNo, $pageSize)
->order('create_time desc')
->select()->each(function($item){