From a69ef9e11845ce4a32395cf16430ba1de362b736 Mon Sep 17 00:00:00 2001
From: chenzhi <chenzhi063@qq.com>
Date: Wed, 11 Mar 2020 14:06:08 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=85=AC=E4=BC=9A=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1=E5=B9=B3=E5=8F=B0=E5=B8=81=E5=86=85=E5=85=85=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E4=B8=8D=E7=AC=A6=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Admin/Controller/FinancePromoteController.class.php        | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Application/Admin/Controller/FinancePromoteController.class.php b/Application/Admin/Controller/FinancePromoteController.class.php
index 1affaa292..41f04b0bf 100644
--- a/Application/Admin/Controller/FinancePromoteController.class.php
+++ b/Application/Admin/Controller/FinancePromoteController.class.php
@@ -111,6 +111,7 @@ class FinancePromoteController extends AdminController
             "inside_cash_count"=>0,
         );
         foreach($senddata as $k=>$v){
+            $v['company_belong'] = $v['company_belong'] ?:0;
             $v['company_belong'] = getCompanyBlong($v['company_belong']);
             if(empty($v['company_name'])) $v['company_name']= $this->COMPANY_NAME;
             if(empty($v['p_id'])) $v['p_id']= "0";
@@ -788,7 +789,7 @@ class FinancePromoteController extends AdminController
             if($_REQUEST['promote_id'] == 0){
                 $isgf = true;
             }
-            $map['s.promote_id'] = $_REQUEST['promote_id'];
+            $map['s.promote_id'] = $map['s.promote_id'] = array("in",implode(",",array_column(getPrmoteChlidAccount($_REQUEST['promote_id'],"id"),"id")).",".$_REQUEST['promote_id']);
         }
         //检索
         if (isset($_REQUEST['sn'])) {