From 8fee02fc4c757e1497b7e910ed287e234576462c Mon Sep 17 00:00:00 2001
From: yulingwei <2436953959@qq.com>
Date: Thu, 21 Nov 2019 23:12:24 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Admin/View/User/rolelist.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Application/Admin/View/User/rolelist.html b/Application/Admin/View/User/rolelist.html
index d0adefd7d..bad81eab1 100644
--- a/Application/Admin/View/User/rolelist.html
+++ b/Application/Admin/View/User/rolelist.html
@@ -124,7 +124,7 @@
 		<notempty name="list">
 		<volist name="list" id="data">
 		<tr>
-            <td>{$data.play_time|date='Y-m-d H:i:s',###}</td>
+            <td>{$data.create_time|date='Y-m-d H:i:s',###}</td>
 			<td>{$data.user_account} </td>
       <?php $gamename = trim($data['game_name']);
       $servername = trim($data['server_name']);

From 638a206ad6a7dc37fb797d9d9226df8f49dabad9 Mon Sep 17 00:00:00 2001
From: chenxiaojun <956334972@qq.com>
Date: Thu, 21 Nov 2019 23:14:54 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E6=8E=A8=E5=B9=BF=E5=B9=B3=E5=8F=B0->?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=B1=87=E6=80=BB--bug=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Home/Controller/QueryController.class.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Application/Home/Controller/QueryController.class.php b/Application/Home/Controller/QueryController.class.php
index bbbf0f56d..44958325c 100644
--- a/Application/Home/Controller/QueryController.class.php
+++ b/Application/Home/Controller/QueryController.class.php
@@ -1769,9 +1769,10 @@ class QueryController extends BaseController
                 $map['promote_id'] = $queryPromote['id'];
             }
 
-            $roleIds = M('user_play_data_count', 'tab_')->group('role_id')->getField('role_id', true);
-            $map['role_id'] = ['in', $roleIds];
             $subMap['create_time'] = ['between', [$begTime, $endTime - 1]];
+            $roleIdMap = $subMap;
+            $roleIds = M('user_play_data_count', 'tab_')->where($roleIdMap)->group('role_id')->getField('role_id', true);
+            $map['role_id'] = ['in', $roleIds];
             if ($costBegin != '' || $costEnd != '') {
                 $having = '';
                 if ($costBegin != '' && $costEnd != '') {

From 0239a5f8e47b2ec23bb323ed2461a595821a0412 Mon Sep 17 00:00:00 2001
From: zhanglingsheng <zhanglingsheng@qq.com>
Date: Thu, 21 Nov 2019 23:20:27 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=BA=AB=E4=BB=BD?=
 =?UTF-8?q?=E8=AF=81=E8=AE=A4=E8=AF=81=E4=BF=A1=E6=81=AF=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Data/update.sql | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/Data/update.sql b/Data/update.sql
index c989c2a8c..ceea135f4 100644
--- a/Data/update.sql
+++ b/Data/update.sql
@@ -527,4 +527,17 @@ ALTER TABLE `tab_user_play_data_count`
 ADD INDEX `search`(`game_id`, `server_id`, `role_id`) USING BTREE,
 ADD INDEX `create_time`(`create_time`) USING BTREE;
 ADD INDEX `recharge_cost`(`recharge_cost`) USING BTREE,
-ADD INDEX `recharge_count`(`recharge_count`) USING BTREE;
\ No newline at end of file
+ADD INDEX `recharge_count`(`recharge_count`) USING BTREE;
+
+--身份证认证信息
+CREATE TABLE `tab_idcard_log` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `name` varchar(80) NOT NULL COMMENT '姓名',
+  `id_card` varchar(20) NOT NULL COMMENT '身份证号码',
+  `user_id` int(11) NOT NULL COMMENT '用户id',
+  `ip` varchar(40) DEFAULT '0' COMMENT 'ip地址',
+  `num` int(11) DEFAULT '1' COMMENT '错误次数',
+  `status` tinyint(2) DEFAULT '0' COMMENT '0 认证失败 1 认证成功',
+  `create_time` int(11) DEFAULT '0' COMMENT '创建时间',
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM AUTO_INCREMENT=12 DEFAULT CHARSET=utf8 COMMENT='身份证认证信息';
\ No newline at end of file