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);