From e31ad349aefe752a2c5c6d845c7c66fc9638c4d4 Mon Sep 17 00:00:00 2001
From: sunke <18850253506@163.com>
Date: Tue, 19 Nov 2019 16:31:17 +0800
Subject: [PATCH] register get method

---
 .../Home/Controller/DownloadController.class.php      | 11 ++++++-----
 Application/Home/View/default/Query/register.html     |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/Application/Home/Controller/DownloadController.class.php b/Application/Home/Controller/DownloadController.class.php
index ea2f579ad..f710e8b92 100644
--- a/Application/Home/Controller/DownloadController.class.php
+++ b/Application/Home/Controller/DownloadController.class.php
@@ -407,6 +407,7 @@ class DownloadController extends BaseController {
         if (!empty($payOrderNumber)) {
             $map['pay_order_number'] = $payOrderNumber;
         }
+        
         if (!empty($begTime) && empty($endTime)) {
             $map['pay_time'] = ['egt', $begTime];
         } elseif (empty($begTime) && !empty($endTime)) {
@@ -1582,12 +1583,12 @@ class DownloadController extends BaseController {
         empty($sdk_version) || $map['tab_game.sdk_version'] = $sdk_version;
         if(empty($begtime) && empty($endtime)) {
             $nowTime = date('Y-m-d');
-            $begtime = date('Y-m-d', strtotime('-6 day', strtotime($nowTime)));
-            $endtime = $nowTime;
-            $map["apply_time"] = ["between",[$begtime,$endtime]];
+            $begtime1 = date('Y-m-d', strtotime('-6 day', strtotime($nowTime)));
+            $endtime1 = $nowTime;
+            $map["apply_time"] = ["between",[strtotime($begtime1),strtotime($endtime1)]];
         }
         if(!empty($begtime) && !empty($endtime)) {
-            $map["apply_time"] = ["between",[$begtime,$endtime]];
+            $map["apply_time"] = ["between",[strtotime($begtime),strtotime($endtime)]];
         }
         $serverField = '';
         $serverJoin = '';
@@ -1790,7 +1791,7 @@ class DownloadController extends BaseController {
              $params['end_time'] = $endTime;
              unset($map['apply_time']);
          }
-         if(!empty($map['tab_server.server_id'])) {
+        if(!empty($map['tab_server.server_id'])) {
              $serverJoin = 'tab_server on tab_server.game_id = tab_apply.game_id';
              $params['server_id'] = $map['tab_server.server_id'];
          }
diff --git a/Application/Home/View/default/Query/register.html b/Application/Home/View/default/Query/register.html
index 3f10c5966..8232a5ffe 100644
--- a/Application/Home/View/default/Query/register.html
+++ b/Application/Home/View/default/Query/register.html
@@ -126,7 +126,7 @@
         </div>
         <div class="pagenation clearfix">
             <?php if ($loginer['level'] !== 4) :?>
-            <a id="sch-btn" data-href="{:U('download/regist_data_export',array_merge(['xlsname'=>'ceshi'],I('post.')))}" class="ajax-get">导出</a>
+            <a id="sch-btn" data-href="{:U('download/regist_data_export',array_merge(['xlsname'=>'ceshi'],I('get.')))}" class="ajax-get">导出</a>
             <?php endif ;?>
           {$_page}
         </div>