From 9198c17d5f65e7f2ac1c1d662520cb668dd52314 Mon Sep 17 00:00:00 2001
From: zhengyongxing <as123498@qq.com>
Date: Wed, 27 Nov 2019 10:10:03 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E7=BB=9F=E8=AE=A1=E6=B8=B8?=
 =?UTF-8?q?=E6=88=8F=E6=B3=A8=E5=86=8C=E5=AF=BC=E5=87=BA=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Admin/Controller/ExportController.class.php  | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/Application/Admin/Controller/ExportController.class.php b/Application/Admin/Controller/ExportController.class.php
index 9a441082d..6c3984da0 100644
--- a/Application/Admin/Controller/ExportController.class.php
+++ b/Application/Admin/Controller/ExportController.class.php
@@ -1645,11 +1645,18 @@ class ExportController extends Controller
         $arraypage=$page;
         $row = 10;
         $user=M('User','tab_');
-        $map['fgame_id']=array('gt',0);$map['puid'] = 0;
+        $map['fgame_id']=array('egt',0);$map['puid'] = 0;
         if(isset($_REQUEST['timestart'])&&isset($_REQUEST['timeend'])){
             $map['register_time'] =array('BETWEEN',array(strtotime($_REQUEST['timestart']),strtotime($_REQUEST['timeend'])+24*60*60-1));
             unset($_REQUEST['timestart']);unset($_REQUEST['timeend']);
+        } elseif (!empty($_REQUEST['timestart']) && empty($_REQUEST['timeend'])) {
+            $map['register_time'] = ['between', array(strtotime($_REQUEST['timestart']), time())];
+            unset($_REQUEST['timestart']);
+        } elseif (empty($_REQUEST['timestart']) && !empty($_REQUEST['timeend'])) {
+            $map['register_time'] = ['elt', strtotime($_REQUEST['timeend']) + 86399];
+            unset($_REQUEST['timeend']);
         }
+
         if(isset($_REQUEST['start'])&&isset($_REQUEST['end'])){
             $map['register_time'] =array('BETWEEN',array(strtotime($_REQUEST['start']),strtotime($_REQUEST['end'])+24*60*60-1));
             unset($_REQUEST['start']);unset($_REQUEST['end']);
@@ -1668,13 +1675,18 @@ class ExportController extends Controller
 			    count(IF(register_time '.$mounth.',1,null)) as mounth')
             ->where($map)
             ->group('fgame_id')
-            ->order('count desc')
+            ->order('count desc,register_time')
             ->select();
+
         $count=count($data);
         foreach ($data as $key => $value) {
             static $i=0;
             $i++;
             $data[$key]['rand']=$i;
+
+            if ($data[$key]['fgame_id'] == 0) {
+                $data[$key]['fgame_name'] = '其他注册';
+            }
         }
         $total=A('Platform')->data_total($data);
         if($_REQUEST['data_order']!=''){