Merge branch 'master_hotfix' into dev

Application/Admin/Controller/MemberController.class.php

@@ -1133,7 +1133,7 @@ class MemberController extends ThinkController
             unset($_REQUEST['end']);
         }
         if (isset($_REQUEST['account'])) {
-            $map['user_account'] = array('like', '%' . trim($_REQUEST['account']) . '%');
+            $map['user_account'] = array('like',  trim($_REQUEST['account']) . '%');
             unset($_REQUEST['account']);
         }
         if (isset($_REQUEST['server_name'])) {
@@ -1169,9 +1169,13 @@ class MemberController extends ThinkController
         // $map['login_time'] = ['exp', 'login_time<>0'];
         $extend = array();
         $extend['map'] = $map;
-        $count = M('UserLoginRecord','tab_')->table('tab_user_login_record FORCE INDEX(user_id_promote_idx)')->field('user_id')->where($extend['map'])->group('user_id')->select(false);
+        $count = M('UserLoginRecord','tab_')
+//            ->table('tab_user_login_record FORCE INDEX(user_id_promote_idx)')
+            ->field('user_id')->where($extend['map'])
+            ->group('user_id')
+            ->select(false);
         $sql = "select count(user_id) as count from ({$count})t";
-
+//        dd($sql);
         $count = M('UserLoginRecord','tab_')->query($sql);
 
         $this->m_title = '登录记录';