From c6b3d1948e8adb8834841d423f236e96eb67cbfe Mon Sep 17 00:00:00 2001
From: chenzhi <chenzhi063@qq.com>
Date: Wed, 29 Jul 2020 18:48:44 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=89=93=E6=AC=BE=E5=89=94?=
 =?UTF-8?q?=E9=99=A4=E5=90=8E=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CompanyStatementPoolController.class.php       | 14 +++++---------
 .../View/CompanyStatementPool/viewPuPool.html      |  2 +-
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/Application/Admin/Controller/CompanyStatementPoolController.class.php b/Application/Admin/Controller/CompanyStatementPoolController.class.php
index 26fd97950..ddde3be3b 100644
--- a/Application/Admin/Controller/CompanyStatementPoolController.class.php
+++ b/Application/Admin/Controller/CompanyStatementPoolController.class.php
@@ -223,7 +223,7 @@ class CompanyStatementPoolController extends ThinkController
                 $l_ids = $pool_info['create_lack_ids'];
                 $lack_info = M("company_lack_statement_info","tab_")->field("*,'0' as st")->where("id in ({$l_ids})")->select();
 
-                $infolist += $lack_info;
+                $infolist =array_merge($infolist,$lack_info);
             }
             $this->viewPuPool($infolist,$is_export);
         }
@@ -259,15 +259,11 @@ class CompanyStatementPoolController extends ThinkController
                     }else{
                         $va['sum_money'] =  "=J{$line}*(K{$line}+L{$line})+M{$line}-N{$line}";
                     }
-                    if($v['st'] == 1){
-                        $count['sum_money_exp'] .= "O{$line}+";
-                        $count['platform_amount_exp'] .= "J{$line}+";
-                    }
+                    $count['sum_money_exp'] .= "O{$line}+";
+                    $count['platform_amount_exp'] .= "J{$line}+";
                 }else{
-                    if($v['st'] == 1){
-                        $count['platform_amount'] += $va['pay_amount'];
-                        $count['sum_money'] +=  $va['sum_money'];
-                    }
+                    $count['platform_amount'] += $va['pay_amount'];
+                    $count['sum_money'] +=  $va['sum_money'];
                 }
             }
             $v['statement_count'] = count($v['statement_info']);
diff --git a/Application/Admin/View/CompanyStatementPool/viewPuPool.html b/Application/Admin/View/CompanyStatementPool/viewPuPool.html
index ff2734b8b..5b6b25910 100644
--- a/Application/Admin/View/CompanyStatementPool/viewPuPool.html
+++ b/Application/Admin/View/CompanyStatementPool/viewPuPool.html
@@ -193,7 +193,7 @@
                         </foreach>
                     </foreach>
                     <tr>
-                        <td colspan=9 >合计(仅统计结算公司):</td>
+                        <td colspan=9 >合计:</td>
                         <td>{$count.platform_amount|default=0}</td>
                         <td></td>
                         <td></td>