diff --git a/app/common/repositories/system/merchant/MerchantTypeRepository.php b/app/common/repositories/system/merchant/MerchantTypeRepository.php index 00eb9b4e..77a03c77 100644 --- a/app/common/repositories/system/merchant/MerchantTypeRepository.php +++ b/app/common/repositories/system/merchant/MerchantTypeRepository.php @@ -51,16 +51,27 @@ class MerchantTypeRepository extends BaseRepository public function getSelect($getAll = true, $siftStore = false) { - $merTypeIds = $this->userApply ? Merchant::AllowApply : Merchant::AllowDisplay; + // $merTypeIds = $this->userApply ? Merchant::AllowApply : Merchant::AllowDisplay; + $merTypeIds = []; + $queryBuilder = MerchantType::getDB(); + if ($this->userApply) { + $merTypeIds = []; + $queryBuilder = $queryBuilder->where('is_allow_apply', 1); + } else { + $queryBuilder = $queryBuilder->where('is_search_display', 1); + } + // 搜索商家时屏蔽市级供应链 // Merchant::TypeSupplyChain if ($siftStore == true) { - foreach($merTypeIds as $k=>$v) { - if ($v == Merchant::TypeSupplyChain) { - unset($merTypeIds[$k]); - } - } + // foreach($merTypeIds as $k=>$v) { + // if ($v == Merchant::TypeSupplyChain) { + // unset($merTypeIds[$k]); + // } + // } + $queryBuilder = $queryBuilder->where('type_code', '<>', 'TypeSupplyChain'); } + $merTypeIds = $queryBuilder->column('mer_type_id'); $query = MerchantType::getDB()->when(!$getAll, function ($query) use ($merTypeIds) { $query->whereIn('mer_type_id', $merTypeIds); })->field('mer_type_id,type_name');