From f0d28e81c4d89823cdb7b9a380c17e0c9df47ea4 Mon Sep 17 00:00:00 2001
From: sunke <18850253506@163.com>
Date: Tue, 26 Nov 2019 19:47:30 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Home/Controller/DownloadController.class.php      | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/Application/Home/Controller/DownloadController.class.php b/Application/Home/Controller/DownloadController.class.php
index c5e82e793..a7de2c5ca 100644
--- a/Application/Home/Controller/DownloadController.class.php
+++ b/Application/Home/Controller/DownloadController.class.php
@@ -2439,7 +2439,7 @@ class DownloadController extends BaseController {
 
         $perSize = 5000;//每次查询的条数
         $pages   = ceil($accessNum / $perSize);
-        for($i = 1; $i <= $pages - 1; $i++) {
+        for($i = 1; $i <= $pages; $i++) {
             foreach($data as $value) {
                 mb_convert_variables('GBK', 'UTF-8', $value);
                 fputcsv($fp, $value);
@@ -2952,7 +2952,7 @@ class DownloadController extends BaseController {
             ->where($map)
             ->order('tab_spend.id desc')
             ->select();
-    
+        
         $csvFileName = $xlsName.'.csv';
         //设置好告诉浏览器要下载excel文件的headers
         header('Content-Description: File Transfer');
@@ -2967,6 +2967,7 @@ class DownloadController extends BaseController {
         $accessNum = count($data1)?:0 ;
         $perSize = 5000;//每次查询的条数
         $pages   = ceil($accessNum / $perSize);
+
         for($i = 1; $i <= $pages; $i++) {
             $model = M('spend','tab_');
             $data = $model
@@ -3017,12 +3018,10 @@ class DownloadController extends BaseController {
             $csvData["p_proinfo"] = $value1["p_proinfo"];
             $csvData["proinfo"] = $value1["proinfo"];
             $csvData["pay_time"] = $value1["pay_time"];
+            mb_convert_variables('GBK', 'UTF-8', $csvData);
+            fputcsv($fp, $csvData);
             $xlsData[] = $csvData;
         }    
-            foreach($xlsData as $value) {
-                mb_convert_variables('GBK', 'UTF-8', $value);
-                fputcsv($fp, $value);
-            }
             unset($xlsData);
             ob_flush();
             flush();