mkm/shop-php
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新

Browse Source
This commit is contained in:
mkm 2023-10-08 17:01:03 +08:00
parent 3cdc6a8084
commit d50c251e48
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/controller/admin/user/UserBill.php
View File

@ -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']!=''){