diff --git a/Application/Admin/Controller/ExportController.class.php b/Application/Admin/Controller/ExportController.class.php
index 2b99a255e..a8325b244 100644
--- a/Application/Admin/Controller/ExportController.class.php
+++ b/Application/Admin/Controller/ExportController.class.php
@@ -3512,23 +3512,24 @@ class ExportController extends Controller
$start_time = $start = strtotime($start);
$end_time = $end = strtotime($end) + 86400;
- if (is_file(RUNTIME_PATH.'/access_data_ltv.txt')) {
- $filetxt = file_get_contents(RUNTIME_PATH.'/access_data_ltv.txt');
+ // if (is_file(RUNTIME_PATH.'/access_data_ltv.txt')) {
+ // $filetxt = file_get_contents(RUNTIME_PATH.'/access_data_ltv.txt');
- $data = json_decode($filetxt, true);
- }
+ // $data = json_decode($filetxt, true);
+ // }
$map = " 1=1 ";
$game_map = "";
- if (isset($_REQUEST['game_name'])) {
+ if (isset($_REQUEST['game_name']) && isset($_REQUEST['server_name'])) {
$game_ids = implode(',', array_column(getGameByName($_REQUEST['game_name'], $_REQUEST['game_type']), 'id'));
- $map .= " AND game_id in (" . implode(',', array_column(getGameByName($_REQUEST['game_name'], $_REQUEST['game_type']), 'id')) . ")";
+ $map .= " AND game_id in ({$game_ids})";
$game_map = " AND EXISTS (SELECT upi.user_id FROM tab_user_play_info as upi where upi.game_id in ({$game_ids}) AND upi.user_id = u.id ";
if (isset($_REQUEST['server_name'])) $game_map .= " AND upi.server_name = '{$_REQUEST['server_name']}' ";
$game_map .= ") ";
- }
-
- if (isset($_REQUEST['server_name'])) {
- $map .= " AND server_name = '{$_REQUEST['server_name']}' ";
+ } else if (isset($_REQUEST['game_name'])) {
+ $game_ids = implode(',', array_column(getGameByName($_REQUEST['game_name'], $_REQUEST['game_type']), 'id'));
+ $map .= " AND game_id in ({$game_ids})";
+ $game_map = " AND EXISTS (SELECT upi.user_id FROM tab_user_play as upi where upi.game_id in ({$game_ids}) AND upi.user_id = u.id ";
+ $game_map .= ") ";
}
// 获取包含的用户id
diff --git a/Application/Admin/View/Promote/linkInfo.html b/Application/Admin/View/Promote/linkInfo.html
index d7bda346e..d51494153 100644
--- a/Application/Admin/View/Promote/linkInfo.html
+++ b/Application/Admin/View/Promote/linkInfo.html
@@ -65,7 +65,7 @@