From b3e32506cc596a91b40c045b482384dbc4b0269e Mon Sep 17 00:00:00 2001
From: liuweiwen <“529520975@qq.com>
Date: Sat, 28 Dec 2019 15:29:12 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E4=BC=9A=E7=BB=9F=E8=AE=A1=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2=E5=85=AC=E5=8F=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../FinancePromoteController.class.php        | 20 +++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/Application/Admin/Controller/FinancePromoteController.class.php b/Application/Admin/Controller/FinancePromoteController.class.php
index 63409d2dc..f18459b7c 100644
--- a/Application/Admin/Controller/FinancePromoteController.class.php
+++ b/Application/Admin/Controller/FinancePromoteController.class.php
@@ -41,6 +41,7 @@ class FinancePromoteController extends AdminController
         $senddata = [];
         //获取各会长的充值方式
         $cash = self::getJoinPromoteData([],$istimeselect);
+
         foreach($cash as $k=>$v){
             $senddata[$v['p_id']] = $v;
         }
@@ -56,19 +57,22 @@ class FinancePromoteController extends AdminController
                 $senddata[$v['p_id']] = $v;
             };
         }
+
         if(!empty($senddata)){
             if(array_key_exists(0,$senddata) || $_REQUEST['promote_id']==0){
-                $pmap['status']=1;
-                if($istimeselect){
-                    $pmap['create_time'] = $istimeselect;
+                if (empty($_REQUEST['company_id'])) {
+                    $pmap['status']=1;
+                    if($istimeselect){
+                        $pmap['create_time'] = $istimeselect;
+                    }
+                    $admininside = M("provide_user p","tab_")->field("sum(amount) amount")->where($pmap)->find();
+                    if($admininside['amount'] >0){
+                        $senddata[0]['inside_cash_count']= $admininside['amount'];
+                    }
                 }
-                $admininside = M("provide_user p","tab_")->field("sum(amount) amount")->where($pmap)->find();
-                if($admininside['amount'] >0){
-                    $senddata[0]['inside_cash_count']= $admininside['amount'];
-                }
-               
             }
         }
+
         $data = [];
         $count =array(
             "cash_count"=>0,