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

Application/Home/Controller/DownloadController.class.php

@@ -11,6 +11,7 @@ use Base\Service\PromoteService;
 use Base\Facade\Request;
 use Base\Service\ApplyService;
 use Base\Service\PromoteCoinRecordService;
+use Base\Service\PromoteCoinTransferLogService;
 
 /**
  * @author elf<360197197@qq.com>
@@ -921,7 +922,7 @@ class DownloadController extends BaseController {
     * @author sunke 
     */
      public function coinrecord_data_export() {
-        $gameId = I('game_id', 0);
+        $gameId = I('game_id', -1);
         $account = I('account', '');
         $sn = I('sn', '');
         $startTime = I('time_end', '');
@@ -949,7 +950,7 @@ class DownloadController extends BaseController {
             $idArr1 = rtrim($idArr,',');
             $map['target_id'] = ['in',$idArr1];
          }
-         if($gameId) {
+         if($gameId !== -1) {
              $map['game_id'] = $gameId;
          }
          $conditions = json_encode($map,TRUE);