From f50c7570bd207e35616b80345b8f948298cbc763 Mon Sep 17 00:00:00 2001
From: wuhui_zzw <1760308791@qq.com>
Date: Fri, 14 Jun 2024 17:50:17 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E8=82=A1=E4=B8=9C?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=B2=A1=E6=9C=89=E5=8C=BA=E5=88=86=E5=95=86?=
 =?UTF-8?q?=E6=88=B7=E7=B1=BB=E5=9E=8B=E7=9A=84=E9=97=AE=E9=A2=98=EF=BC=8C?=
 =?UTF-8?q?=E5=AF=BC=E8=87=B4=E8=82=A1=E4=B8=9C=E5=88=97=E8=A1=A8=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E4=BA=86=E5=85=B6=E4=BB=96=E7=B1=BB=E5=9E=8B=E5=95=86?=
 =?UTF-8?q?=E6=88=B7=E7=9A=84=E8=82=A1=E4=B8=9C=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/common/dao/system/merchant/MerchantShareholderDao.php | 8 ++++++++
 app/controller/admin/system/merchant/Shareholder.php      | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/app/common/dao/system/merchant/MerchantShareholderDao.php b/app/common/dao/system/merchant/MerchantShareholderDao.php
index 96041cb..13e8028 100644
--- a/app/common/dao/system/merchant/MerchantShareholderDao.php
+++ b/app/common/dao/system/merchant/MerchantShareholderDao.php
@@ -4,6 +4,7 @@ namespace app\common\dao\system\merchant;
 
 use app\common\dao\BaseDao;
 use app\common\model\system\merchant\MerchantShareholder;
+use app\common\repositories\system\merchant\MerchantShareholderLevelRepository;
 use app\common\repositories\user\UserRepository;
 
 class MerchantShareholderDao extends BaseDao{
@@ -35,6 +36,13 @@ class MerchantShareholderDao extends BaseDao{
             ->when(isset($params['status']) && $params['status'] !==  '',function($query) use ($params){
                 $query->where('status', (int)$params['status']);
             })
+            ->when(isset($params['merchant_type']) && $params['merchant_type'] !==  '',function($query) use ($params){
+                $levelIds = app()->make(MerchantShareholderLevelRepository::class)
+                    ->getSearchModel(['merchant_type'=>$params['merchant_type']])
+                    ->column('id');
+
+                $query->whereIn('level_id', $levelIds);
+            })
             ->when(isset($params['search_text']) && $params['search_text'] !==  '',function($query) use ($params){
                 $uids = app()
                     ->make(UserRepository::class)
diff --git a/app/controller/admin/system/merchant/Shareholder.php b/app/controller/admin/system/merchant/Shareholder.php
index 30b7f88..6468333 100644
--- a/app/controller/admin/system/merchant/Shareholder.php
+++ b/app/controller/admin/system/merchant/Shareholder.php
@@ -27,7 +27,7 @@ class Shareholder extends BaseController{
      */
     public function getList(){
         [$page, $limit] = $this->getPage();
-        $params = $this->request->params(['level_id','mer_id','uid','search_text']);
+        $params = $this->request->params(['level_id','mer_id','uid','search_text', 'merchant_type']);
         $data = $this->repository->getList((array)$params,(int)$page,(int)$limit);
 
         return app('json')->success($data);