From 36b9b51817a5a983caf23469cd401b85b4350789 Mon Sep 17 00:00:00 2001
From: chenxiaojun <956334972@qq.com>
Date: Thu, 24 Oct 2019 19:28:09 +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=E6=B1=87=E6=80=BB|=E6=AF=8F=E6=97=A5=E6=A6=82?=
 =?UTF-8?q?=E5=86=B5|=E8=AE=A2=E5=8D=95=E6=9F=A5=E8=AF=A2|=E6=B3=A8?=
 =?UTF-8?q?=E5=86=8C=E6=98=8E=E7=BB=86->=E6=A3=80=E7=B4=A2=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Home/Controller/QueryController.class.php | 48 +++++++++++--------
 .../Home/View/default/Query/dailySummary.html |  2 +-
 .../Home/View/default/Query/recharge.html     |  2 +-
 .../Home/View/default/Query/register.html     |  2 +-
 .../Home/View/default/Query/summary.html      |  2 +-
 5 files changed, 31 insertions(+), 25 deletions(-)

diff --git a/Application/Home/Controller/QueryController.class.php b/Application/Home/Controller/QueryController.class.php
index ab6cfaf4e..d593ace66 100644
--- a/Application/Home/Controller/QueryController.class.php
+++ b/Application/Home/Controller/QueryController.class.php
@@ -1154,34 +1154,37 @@ class QueryController extends BaseController
                 ->select());//创角用户
 
             $newUserNumData = $userPlayInfoModel
-                ->field('tab_user_play_info.create_time,count(distinct tab_user_play_info.user_id) as num')
+                ->field('tab_user_play_info.create_time')
                 ->join($join)
                 ->where($userPlayInfoWhere2)
                 ->where($map)
-                ->having('tab_user_play_info.create_time between ' . $begTime . ' and ' . ($endTime + 86399))
+                ->group('tab_user_play_info.user_id')
+                ->having('tab_user_play_info.create_time between ' . $thisDateTime . ' and ' . ($thisDateTime + 86399))
                 ->order('tab_user_play_info.id')
-                ->find();
-            $list['new_user_num'] = empty($newUserNumData['num']) ? 0 : $newUserNumData['num'];//新创角用户
+                ->select();
+            $list['new_user_num'] = count($newUserNumData);//新创角用户
 
             $newDeviceData = $userPlayInfoModel
-                ->field('tab_user_play_info.create_time,count(distinct tab_user_play_info.create_device_number) as num')
+                ->field('tab_user_play_info.create_time')
                 ->join($join)
                 ->where($userPlayInfoWhere2)
                 ->where($map)
-                ->having('tab_user_play_info.create_time between ' . $begTime . ' and ' . ($endTime + 86399))
+                ->group('tab_user_play_info.create_device_number')
+                ->having('tab_user_play_info.create_time between ' . $thisDateTime . ' and ' . ($thisDateTime + 86399))
                 ->order('tab_user_play_info.id')
-                ->find();
-            $list['new_device_num'] = empty($newDeviceData['num']) ? 0 : $newDeviceData['num'];//新创角设备
+                ->select();
+            $list['new_device_num'] = count($newDeviceData);//新创角设备
 
             $newIpNumData = $userPlayInfoModel
-                ->field('tab_user_play_info.create_time,count(distinct tab_user_play_info.create_ip) as num')
+                ->field('tab_user_play_info.create_time')
                 ->join($join)
                 ->where($userPlayInfoWhere2)
                 ->where($map)
-                ->having('tab_user_play_info.create_time between ' . $begTime . ' and ' . ($endTime + 86399))
+                ->group('tab_user_play_info.create_ip')
+                ->having('tab_user_play_info.create_time between ' . $thisDateTime . ' and ' . ($thisDateTime + 86399))
                 ->order('tab_user_play_info.id')
-                ->find();
-            $list['new_ip_num'] = empty($newIpNumData['num']) ? 0 : $newIpNumData['num'];//新增创角IP
+                ->select();
+            $list['new_ip_num'] = count($newIpNumData);//新增创角IP
 
             $list['login_user_num'] = count(M('UserGameLoginRecord', 'tab_')
                 ->join($join)
@@ -1451,28 +1454,31 @@ class QueryController extends BaseController
                     ->count('distinct tab_user_play_info.user_id');//创角用户
 
                 $newUserNumData = $userPlayInfoModel
-                    ->field('tab_user_play_info.create_time,count(distinct tab_user_play_info.user_id) as num')
+                    ->field('tab_user_play_info.create_time')
                     ->where($userPlayInfoMap2)
+                    ->group('tab_user_play_info.user_id')
                     ->having('tab_user_play_info.create_time between ' . $begTime . ' and ' . ($endTime + 86399))
                     ->order('tab_user_play_info.id')
-                    ->find();
-                $list['new_user_num'] = empty($newUserNumData['num']) ? 0 : $newUserNumData['num'];//新创角用户
+                    ->select();
+                $list['new_user_num'] = count($newUserNumData);//新创角用户
 
                 $newDeviceData = $userPlayInfoModel
-                    ->field('tab_user_play_info.create_time,count(distinct tab_user_play_info.create_device_number) as num')
+                    ->field('tab_user_play_info.create_time')
                     ->where($userPlayInfoMap2)
+                    ->group('tab_user_play_info.create_device_number')
                     ->having('tab_user_play_info.create_time between ' . $begTime . ' and ' . ($endTime + 86399))
                     ->order('tab_user_play_info.id')
-                    ->find();
-                $list['new_device_num'] = empty($newDeviceData['num']) ? 0 : $newDeviceData['num'];//新创角设备
+                    ->select();
+                $list['new_device_num'] = count($newDeviceData);//新创角设备
 
                 $newIpData = $userPlayInfoModel
-                    ->field('tab_user_play_info.create_time,count(distinct tab_user_play_info.create_ip) as num')
+                    ->field('tab_user_play_info.create_time')
                     ->where($userPlayInfoMap2)
+                    ->group('tab_user_play_info.create_ip')
                     ->having('tab_user_play_info.create_time between ' . $begTime . ' and ' . ($endTime + 86399))
                     ->order('tab_user_play_info.id')
-                    ->find();
-                $list['new_ip_num'] = empty($newIpData['num']) ? 0 : $newIpData['num'];//新增创角IP
+                    ->select();
+                $list['new_ip_num'] = count($newIpData);//新增创角IP
 
                 $list['login_user_num'] = $userGameLoginModel
                     ->where($userGameLoginMap)
diff --git a/Application/Home/View/default/Query/dailySummary.html b/Application/Home/View/default/Query/dailySummary.html
index d612be1d1..725d12058 100644
--- a/Application/Home/View/default/Query/dailySummary.html
+++ b/Application/Home/View/default/Query/dailySummary.html
@@ -94,7 +94,7 @@
                   <option value="{$vo.id}">{$vo['account']}({$vo['real_name']})</option>
                 </volist>
               </notempty>
-              <if condition="$_GET['team_leader_id'] gt 0">
+              <if condition="($_GET['team_leader_id'] gt 0 or $thisParentPromoteId gt 0) or ($_GET['team_leader_id'] eq 0 and $thisParentPromoteId gt 0)">
                 <volist name=":getAllPromoteListByType(3,false,empty(I('team_leader_id'))?PID:I('team_leader_id'))" id="vo">
                   <option value="{$vo.id}">{$vo['account']}({$vo['real_name']})</option>
                 </volist>
diff --git a/Application/Home/View/default/Query/recharge.html b/Application/Home/View/default/Query/recharge.html
index fd126b232..d31c923b3 100644
--- a/Application/Home/View/default/Query/recharge.html
+++ b/Application/Home/View/default/Query/recharge.html
@@ -85,7 +85,7 @@
                   <option value="{$vo.id}">{$vo['account']}({$vo['real_name']})</option>
                 </volist>
               </notempty>
-              <if condition="$_GET['team_leader_id'] gt 0">
+              <if condition="($_GET['team_leader_id'] gt 0 or $thisParentPromoteId gt 0) or ($_GET['team_leader_id'] eq 0 and $thisParentPromoteId gt 0)">
                 <volist name=":getAllPromoteListByType(3,false,empty(I('team_leader_id'))?PID:I('team_leader_id'))" id="vo">
                   <option value="{$vo.id}">{$vo['account']}({$vo['real_name']})</option>
                 </volist>
diff --git a/Application/Home/View/default/Query/register.html b/Application/Home/View/default/Query/register.html
index 169dca9da..222d82133 100644
--- a/Application/Home/View/default/Query/register.html
+++ b/Application/Home/View/default/Query/register.html
@@ -56,7 +56,7 @@
                   <option value="{$vo.id}">{$vo['account']}({$vo['real_name']})</option>
                 </volist>
               </notempty>
-              <if condition="$_GET['team_leader_id'] gt 0">
+              <if condition="($_GET['team_leader_id'] gt 0 or $thisParentPromoteId gt 0) or ($_GET['team_leader_id'] eq 0 and $thisParentPromoteId gt 0)">
                 <volist name=":getAllPromoteListByType(3,false,empty(I('team_leader_id'))?PID:I('team_leader_id'))" id="vo">
                   <option value="{$vo.id}">{$vo['account']}({$vo['real_name']})</option>
                 </volist>
diff --git a/Application/Home/View/default/Query/summary.html b/Application/Home/View/default/Query/summary.html
index 545019883..c6c56ef07 100644
--- a/Application/Home/View/default/Query/summary.html
+++ b/Application/Home/View/default/Query/summary.html
@@ -84,7 +84,7 @@
                   <option value="{$vo.id}">{$vo['account']}({$vo['real_name']})</option>
                 </volist>
               </notempty>
-              <if condition="$_GET['team_leader_id'] gt 0">
+              <if condition="($_GET['team_leader_id'] gt 0 or $thisParentPromoteId gt 0) or ($_GET['team_leader_id'] eq 0 and $thisParentPromoteId gt 0)">
                 <volist name=":getAllPromoteListByType(3,false,empty(I('team_leader_id'))?PID:I('team_leader_id'))" id="vo">
                   <option value="{$vo.id}">{$vo['account']}({$vo['real_name']})</option>
                 </volist>