wanma-benteng
/
new-admin-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修复：股东列表没有区分商户类型的问题，导致股东列表显示了其他类型商户的股东信息

This commit is contained in:
wuhui_zzw 2024-06-14 17:50:17 +08:00
parent b2da511be8
commit f50c7570bd
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/common/dao/system/merchant/MerchantShareholderDao.php
View File

@ -4,6 +4,7 @@ namespace app\common\dao\system\merchant;
use app\common\dao\BaseDao; use app\common\dao\BaseDao;
use app\common\model\system\merchant\MerchantShareholder; use app\common\model\system\merchant\MerchantShareholder;
use app\common\repositories\system\merchant\MerchantShareholderLevelRepository;
use app\common\repositories\user\UserRepository; use app\common\repositories\user\UserRepository;
class MerchantShareholderDao extends BaseDao{ class MerchantShareholderDao extends BaseDao{
@ -35,6 +36,13 @@ class MerchantShareholderDao extends BaseDao{
->when(isset($params['status']) && $params['status'] !== '',function($query) use ($params){ ->when(isset($params['status']) && $params['status'] !== '',function($query) use ($params){
$query->where('status', (int)$params['status']); $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){ ->when(isset($params['search_text']) && $params['search_text'] !== '',function($query) use ($params){
$uids = app() $uids = app()
->make(UserRepository::class) ->make(UserRepository::class)

2
app/controller/admin/system/merchant/Shareholder.php
View File

@ -27,7 +27,7 @@ class Shareholder extends BaseController{
*/ */
public function getList(){ public function getList(){
[$page, $limit] = $this->getPage(); [$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); $data = $this->repository->getList((array)$params,(int)$page,(int)$limit);
return app('json')->success($data); return app('json')->success($data);