From db424fde849b19a29bdbf79c018a4a8d471263d3 Mon Sep 17 00:00:00 2001
From: chenxiaojun <956334972@qq.com>
Date: Wed, 23 Oct 2019 11:18:12 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=A8=E5=B9=BF=E5=91=98=E5=90=8E=E5=8F=B0->?=
 =?UTF-8?q?=E6=AF=8F=E6=97=A5=E6=A6=82=E5=86=B5->=E6=B8=B8=E6=88=8F?=
 =?UTF-8?q?=E6=A3=80=E7=B4=A2bug?=
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, 6 insertions(+)

diff --git a/Application/Home/Controller/QueryController.class.php b/Application/Home/Controller/QueryController.class.php
index 1c70e57f1..1c76845ed 100644
--- a/Application/Home/Controller/QueryController.class.php
+++ b/Application/Home/Controller/QueryController.class.php
@@ -1155,7 +1155,9 @@ class QueryController extends BaseController
 
             $newUserNumData = $userPlayInfoModel
                 ->field('tab_user_play_info.create_time,count(distinct tab_user_play_info.user_id) as num')
+                ->join($join)
                 ->where($userPlayInfoWhere2)
+                ->where($map)
                 ->having('tab_user_play_info.create_time between ' . $begTime . ' and ' . ($endTime + 86399))
                 ->order('tab_user_play_info.id')
                 ->find();
@@ -1163,7 +1165,9 @@ class QueryController extends BaseController
 
             $newDeviceData = $userPlayInfoModel
                 ->field('tab_user_play_info.create_time,count(distinct tab_user_play_info.create_device_number) as num')
+                ->join($join)
                 ->where($userPlayInfoWhere2)
+                ->where($map)
                 ->having('tab_user_play_info.create_time between ' . $begTime . ' and ' . ($endTime + 86399))
                 ->order('tab_user_play_info.id')
                 ->find();
@@ -1171,7 +1175,9 @@ class QueryController extends BaseController
 
             $newIpNumData = $userPlayInfoModel
                 ->field('tab_user_play_info.create_time,count(distinct tab_user_play_info.create_ip) as num')
+                ->join($join)
                 ->where($userPlayInfoWhere2)
+                ->where($map)
                 ->having('tab_user_play_info.create_time between ' . $begTime . ' and ' . ($endTime + 86399))
                 ->order('tab_user_play_info.id')
                 ->find();