更新
This commit is contained in:
parent
182ccfce56
commit
3cdc6a8084
@ -61,7 +61,7 @@ class UserBill extends BaseController
|
|||||||
$query->whereTime('create_time', 'between', [$a[0],$a[1]]);
|
$query->whereTime('create_time', 'between', [$a[0],$a[1]]);
|
||||||
}
|
}
|
||||||
if(isset($where['keyword'])&& $where['keyword']!=''){
|
if(isset($where['keyword'])&& $where['keyword']!=''){
|
||||||
$a=Db::name('merchant')->whereLike('mer_name',$where['mer_name'])->column('mer_id');
|
$a=Db::name('merchant')->whereLike('mer_name',$where['keyword'])->column('mer_id');
|
||||||
$query->where('mer_id', 'in', [$a[0],$a[1]]);
|
$query->where('mer_id', 'in', [$a[0],$a[1]]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user