diff --git a/app/controller/admin/user/UserBill.php b/app/controller/admin/user/UserBill.php index 78eb12a4..2ee77f64 100644 --- a/app/controller/admin/user/UserBill.php +++ b/app/controller/admin/user/UserBill.php @@ -61,8 +61,10 @@ class UserBill extends BaseController $query->whereTime('create_time', 'between', [$a[0],$a[1]]); } if(isset($where['keyword'])&& $where['keyword']!=''){ - $a=Db::name('merchant')->whereLike('mer_name',$where['keyword'])->column('mer_id'); - $query->where('mer_id', 'in', [$a[0],$a[1]]); + $a=Db::name('merchant')->whereLike('mer_name','%'.$where['keyword'].'%')->column('mer_id'); + if($a){ + $query->where('mer_id', 'in', $a); + } } if(isset($where['mer_id'])&& $where['mer_id']!=''){