Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev

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']);

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 != '') {

Data/update.sql

@@ -528,3 +528,16 @@ 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;
+
+--身份证认证信息
+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='身份证认证信息';