From 13251872372f9ec2e867d0e68568790fa8deafa7 Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Fri, 17 May 2024 09:14:36 +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/admin/lists/operation/OpurchaseclassLists.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/admin/lists/operation/OpurchaseclassLists.php b/app/admin/lists/operation/OpurchaseclassLists.php
index aad5adc..83455b5 100644
--- a/app/admin/lists/operation/OpurchaseclassLists.php
+++ b/app/admin/lists/operation/OpurchaseclassLists.php
@@ -47,8 +47,10 @@ class OpurchaseclassLists extends BaseAdminDataLists implements ListsSearchInter
         $where=[];
         $merchant=$this->request->get('merchant');
         if($merchant){
-           $mer_id= Merchant::where('mer_id','like','%'.$merchant.'%')->column('mer_id');
-           $where['mer_id']=['in',$mer_id];
+           $mer_id= Merchant::where('mer_name','like','%'.$merchant.'%')->column('mer_id');
+           if($mer_id){
+            $where[]=['merchant','in',$mer_id];
+           }
         }
         $this->where=$where;
         return Opurchaseclass::where($this->searchWhere)
@@ -59,8 +61,7 @@ class OpurchaseclassLists extends BaseAdminDataLists implements ListsSearchInter
             ->select()->each(function($data){
 				$merchant = Merchant::field('mer_name')->where('mer_id',$data['merchant'])->findOrEmpty();
 				$data['merchant_name'] = !$merchant->isEmpty() ? $merchant['mer_name'] : '';
-	        })
-            ->toArray();
+	        })?->toArray();
     }