Merge pull request '优化支付商户配置查看' (#432) from feature/more_payment into master

Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/432

Application/Admin/Controller/PaymentMerchantController.class.php

@@ -407,7 +407,9 @@ class PaymentMerchantController extends ThinkController
             $conditions['_string'].=" AND ( r.company_belong = {$companyBelong} or company_id in ({$promoteCompanyIds}) )";
         }
         if ($companyId != 0) {
-            $conditions['company_id'] = $companyId;
+            //请求公司要姜蓉内外团
+            $companyBelong = M("promote_company","tab_")->where("id = '{$companyId}'")->getField("company_belong");
+            $conditions['_string'] .= " AND ( r.company_belong = {$companyBelong} or company_id ='{$companyId}' )";
         }
         if ($gameTypeId != 0) {
             $conditions['game_type_id'] = $gameTypeId;