Merge branch 'release-1.0.0' into dev

Application/Home/Controller/DownloadController.class.php

@@ -3166,7 +3166,9 @@ class DownloadController extends BaseController {
        }
 
        if(!empty($map['user_account'])) {
-        $map['ui.user_account'] = $map['user_account'];
+           $userId = M('user', 'tab_')->where(array('account' => $map['user_account']))->getField('id');
+           $userId = $userId ?? 0;
+           $map['uc.user_id'] = $userId;
            unset($map['user_account']);
        }
        if(!empty($map['promote_id'])) {
@@ -3231,7 +3233,7 @@ class DownloadController extends BaseController {
              ->field('sum(recharge_cost) recharge_cost,sum(recharge_count) recharge_count,sum(recharge_cost_today) as recharge_cost_today')
              ->find();
          $userIds = array_column($roles, 'user_id');
-         $userIds = $userIds ?? [-1];
+         $userIds = $userIds ? $userIds : [-1];
          $users = M('user', 'tab_')->where(array('id' => ['in', $userIds]))->getField('id, account', true);
         $csvFileName = $xlsName.'.csv';
         //设置好告诉浏览器要下载excel文件的headers

Application/Home/Controller/QueryController.class.php

@@ -1801,7 +1801,9 @@ class QueryController extends BaseController
                 $map['ui.role_name'] = ['like', $roleName . '%'];
             }
             if ($userAccount != '') {
-                $map['ui.user_account'] = ['like', $userAccount . '%'];
+                $userId = M('user', 'tab_')->where(array('account' => ['like', $userAccount . '%']))->getField('id');
+                $userId = $userId ?? 0;
+                $map['uc.user_id'] = $userId;
             }
             if ($isSelf) {
                 $map['uc.promote_id'] = $queryPromote['id'];

Application/Home/View/default/Query/userRecharges.html

@@ -85,6 +85,7 @@
             </div>
           </div>
           <div class="form-group normal_space">
+            <input type="hidden" name="row" value="I('get.row', 10)">
             <input type="hidden" name="last_sort_name" id="last_sort_name" value="{:I('sort_name', '')}">
             <input type="hidden" name="sort_name" id="sort_name" value="{:I('sort_name', '')}">
             <input type="hidden" name="sort" id="sort" value="{$sort}">