From d50c251e481b3cc209797f726e7d7061ece9cc56 Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Sun, 8 Oct 2023 17:01:03 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controller/admin/user/UserBill.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

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