From f05034486cddb273b11e2d944c8bf0c1d3d00735 Mon Sep 17 00:00:00 2001
From: chenxiaojun <956334972@qq.com>
Date: Thu, 12 Dec 2019 17:58:50 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=A8=E5=B9=BF=E5=B9=B3=E5=8F=B0>=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E7=AE=A1=E7=90=86>=E5=85=85=E5=80=BC=E7=8E=A9?=
 =?UTF-8?q?=E5=AE=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/Application/Home/Controller/QueryController.class.php b/Application/Home/Controller/QueryController.class.php
index 72c11f272..a041e3bb4 100644
--- a/Application/Home/Controller/QueryController.class.php
+++ b/Application/Home/Controller/QueryController.class.php
@@ -1856,7 +1856,7 @@ class QueryController extends BaseController
             }
 
             $map['uc.create_time'] = ['between', [$begTime, $endTime - 1]];
-            $fieldUC = "sum(uc.recharge_cost) recharge_cost,sum(uc.recharge_count) recharge_count,sum(if(uc.create_time = {$nowTime},uc.recharge_cost,0)) as recharge_cost_today";
+            $fieldUC = "sum(uc.recharge_cost) recharge_cost,sum(uc.recharge_count) recharge_count,sum(if(uc.create_time = {$nowTime},uc.recharge_cost,0)) as recharge_cost_today,uc.user_id";
             $fieldUI = "ui.user_account,ui.game_name,ui.role_name,ui.role_level,ui.server_name,ui.play_time,ui.play_ip,ui.promote_account,ui.sdk_version,ui.create_time";
 
             $loginRecordMap['lr.create_time'] = $map['uc.create_time'];
@@ -1884,6 +1884,10 @@ class QueryController extends BaseController
             list($records, $pagination, $count) = $this->paginate($query);
 
             foreach ($records as &$list) {
+                if (empty($list['user_account']) ) {
+                    $list['user_account'] = M('user', 'tab_')->where("id = {$list['user_id']}")->getField('account');
+                    $list['user_account'] = empty($list['user_account']) ? '--' : encryption($list['user_account']);
+                }
                 $list['user_account'] = empty($list['user_account']) ? '--' : encryption($list['user_account']);
                 $list['game_name'] = empty($list['game_name']) ? '--' : $list['game_name'];
                 $list['sdk_version'] = empty($list['sdk_version']) ? '--' : getSDKTypeName($list['sdk_version']);