Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev

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'])) {

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>

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();