From f0cbe3cafbfd908f6bc21e0c1bbb73c00ba1cf3a Mon Sep 17 00:00:00 2001
From: zhengyongxing <as123498@qq.com>
Date: Mon, 26 Oct 2020 10:28:05 +0800
Subject: [PATCH] =?UTF-8?q?=E5=91=A8=E7=BB=93=E7=AE=97=E9=87=91=E9=A2=9Dbu?=
 =?UTF-8?q?g=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CompanyStatementPoolController.class.php  | 19 +++++++++++++++++++
 .../View/CompanyStatementPool/viewPuPool.html |  8 ++++----
 2 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/Application/Admin/Controller/CompanyStatementPoolController.class.php b/Application/Admin/Controller/CompanyStatementPoolController.class.php
index eb0c4a9c6..21fc97c57 100644
--- a/Application/Admin/Controller/CompanyStatementPoolController.class.php
+++ b/Application/Admin/Controller/CompanyStatementPoolController.class.php
@@ -412,6 +412,11 @@ class CompanyStatementPoolController extends ThinkController
             $v['statement_info'] = $handle_data;
 
             $v['row'] = $row;
+
+            if ($v['row'] == '0') {
+                $v['row'] = 1;
+            }
+
             if($is_export){
                 if($v['withdraw_type'] != 3) {
                     $v['statement_money'] .="P{$cline}-Q{$cline},2)";
@@ -457,7 +462,17 @@ class CompanyStatementPoolController extends ThinkController
             foreach ($gv as $sk => $sv) {
                 $game_data['account'] = $sk;
                 $game_data['row'] = count($sv);
+
+                if ($game_data['row'] == '0') {
+                    $game_data['row'] = 1;
+                }
+
                 $game_data['time_row'] = count($sv);
+
+                if ($game_data['time_row'] == '0') {
+                    $game_data['time_row'] = 1;
+                }
+
                 $game_data['time'] = $gk;
                 //周结算金额计算
                 for ($i=0;;$i++) {
@@ -685,6 +700,9 @@ class CompanyStatementPoolController extends ThinkController
                 $count['statement_money'] += $v['statement_money'];
             }
             $v['statement_count'] = count($v['statement_info']);
+            if($v['statement_count'] == '0'){
+                $v['statement_count'] = 1;
+            }
             
         }
         if($is_export){
@@ -758,6 +776,7 @@ class CompanyStatementPoolController extends ThinkController
 
         }
 
+
         return $handle_data;
     }
 
diff --git a/Application/Admin/View/CompanyStatementPool/viewPuPool.html b/Application/Admin/View/CompanyStatementPool/viewPuPool.html
index 5a406fb39..b92fd29c5 100644
--- a/Application/Admin/View/CompanyStatementPool/viewPuPool.html
+++ b/Application/Admin/View/CompanyStatementPool/viewPuPool.html
@@ -149,6 +149,7 @@
                                     <td rowspan="{$com['statement_info'][0]['row']}">{$com['statement_info'][0]['account']}</td>
                                 <else />
                                     <td>-</td>
+                                    <td>-</td>
                                 </notempty>
 
                                 <td rowspan="{$com.row}">{$com.company_info.company_belong_str}</td>
@@ -168,7 +169,7 @@
                                     <td><span class="sum_money_span">{$com['statement_info'][0]['game_list'][0]['sum_money']}</span></td>
                                     <td rowspan="{$com.row}">{$com['reward']}</td>
                                     <td rowspan="{$com.row}">{$com['fine']}</td>
-                                    <td rowspan="{$com['statement_info'][0]['time_row']}">{$com['statement_info'][0]['week_amount']}</td>
+                                    <td rowspan="{$com['statement_info'][0]['time_row']}">{$com['statement_info'][0]['week_amount']||default="0"}</td>
                                     <td rowspan="{$com.row}">{$com['statement_money']}</td>
 
                                 <else />
@@ -235,9 +236,8 @@
                                 <foreach name="com['statement_info']" item="account" key="akey">
                                     <if condition="$akey gt 0">
                                         <tr>
-                                            <notempty name="account['time']">
-                                                <td rowspan="{$account['time_row']}">{$account['time']}</td>
-                                            </notempty>
+
+                                            <td rowspan="{$account['time_row']}">{$account['time']|default="-----"}</td>
                                             <td rowspan="{$account['row']}">{$account['account']}</td>
 
                                             <notempty name="account['game_list']">