From 96bf61ada02612e2eb0d62639083b93f01f9e1f9 Mon Sep 17 00:00:00 2001
From: sunke <18850253506@163.com>
Date: Mon, 25 Nov 2019 20:36:01 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E5=86=B2=E5=80=BC=E7=8E=A9=E5=AE=B6promote?=
 =?UTF-8?q?id?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Home/Controller/DownloadController.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Application/Home/Controller/DownloadController.class.php b/Application/Home/Controller/DownloadController.class.php
index 281cdee41..07e77e5e9 100644
--- a/Application/Home/Controller/DownloadController.class.php
+++ b/Application/Home/Controller/DownloadController.class.php
@@ -2857,7 +2857,7 @@ class DownloadController extends BaseController {
         $field = $fieldUC . ',' . $fieldUI;
         $subQuery = M('user_play_data_count', 'tab_')->alias('uc')
         ->field($field)
-        ->join('tab_user_play_info as ui on ui.promote_id = uc.promote_id and ui.game_id = uc.game_id and ui.server_id = uc.server_id and ui.role_id = uc.role_id')
+        ->join('tab_user_play_info as ui on ui.game_id = uc.game_id and ui.server_id = uc.server_id and ui.role_id = uc.role_id')
         ->where($map)
         ->group('uc.role_id,uc.server_id,uc.game_id')
         ->buildSql();

From 777352f1bf50135c34c464afe1f322945215a145 Mon Sep 17 00:00:00 2001
From: zhengyongxing <as123498@qq.com>
Date: Mon, 25 Nov 2019 20:37:24 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E5=B8=81=E5=85=85?=
 =?UTF-8?q?=E5=80=BCbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Admin/View/Deposit/lists.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Application/Admin/View/Deposit/lists.html b/Application/Admin/View/Deposit/lists.html
index 44a90f6f7..7fe8954f1 100644
--- a/Application/Admin/View/Deposit/lists.html
+++ b/Application/Admin/View/Deposit/lists.html
@@ -48,11 +48,11 @@
                        placeholder="订单号"/>
             </div>
             <div class="input-list">
-                <input type="text" id="time-start" name="time-start" class="" value="{:I('time-start')}"
+                <input type="text" id="time-start" name="time-start" class="" value="{:I('time-start')|I('start')}"
                        placeholder="充值开始时间"/>
                 -
                 <div class="input-append date" id="datetimepicker" style="display:inline-block">
-                    <input type="text" id="time-end" name="time-end" class="" value="{:I('time-end')}"
+                    <input type="text" id="time-end" name="time-end" class="" value="{:I('time-end')|I('end')}"
                            placeholder="充值结束时间"/>
                     <span class="add-on"><i class="icon-th"></i></span>
                 </div>

From 6fcdfd2f31bc884db60bbaf0e9339e9df50f3f2b Mon Sep 17 00:00:00 2001
From: zhengyongxing <as123498@qq.com>
Date: Mon, 25 Nov 2019 20:49:47 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Admin/Controller/ExportController.class.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/Application/Admin/Controller/ExportController.class.php b/Application/Admin/Controller/ExportController.class.php
index 34ffcab5b..cc38b611b 100644
--- a/Application/Admin/Controller/ExportController.class.php
+++ b/Application/Admin/Controller/ExportController.class.php
@@ -367,7 +367,11 @@ class ExportController extends Controller
 
                 $game_map = "";
 
-                $game_map .= " and tab_user_play.game_id in (" . implode(',', array_column(getGameByName($_REQUEST['game_name'], $_REQUEST['game_type']), 'id')) . ")";
+//                $game_map .= " and tab_user_play.game_id in (" . implode(',', array_column(getGameByName($_REQUEST['game_name'], $_REQUEST['game_type']), 'id')) . ")";
+
+                if (!empty($_REQUEST['game_name']) || !empty($_REQUEST['game_type'])) {
+                    $game_map .= " and tab_user_play.game_id in (" . implode(',', array_column(getGameByName($_REQUEST['game_name'], $_REQUEST['game_type']), 'id')) . ")";
+                }
 
                 $spendprom = " and ss.game_id in (".implode(',', array_column(getGameByName($_REQUEST['game_name'], $_REQUEST['game_type']), 'id')).")";
                 if (isset($_REQUEST['server_name'])) {