Merge branch 'hotfix/query' into dev

Application/Base/Repository/PromoteRepository.class.php

@@ -48,7 +48,11 @@ class PromoteRepository {
         if (isset($params['lock_status'])) {
             $lockUserIds = M('user', 'tab_')->where(['lock_status' => 0, 'promote_id' => ['in', $allIds]])->getField('id', 'true');
             if (count($lockUserIds) > 0) {
+                if ($params['lock_status'] == 1) {
                     $map['user_id'] = ['not in', $lockUserIds];
+                } else {
+                    $map['user_id'] = ['in', $lockUserIds];
+                }
             }
         }
         return $map;

Application/Home/Controller/QueryController.class.php

@@ -1990,9 +1990,9 @@ class QueryController extends BaseController
             if ($costBegin != '' && $costEnd != '') {
                 $having = 'sum(cost) between ' . $costBegin . ' and ' . $costEnd;
             } elseif ($costBegin != '' && $costEnd == '') {
-                $having = 'sum(cost) > ' . $costBegin;
+                $having = 'sum(cost) >= ' . $costBegin;
             } elseif ($costBegin == '' && $costEnd != '') {
-                $having = 'sum(cost) < ' . $costEnd;
+                $having = 'sum(cost) <= ' . $costEnd;
             }
             $subMap = $map;
             $subMap['pay_status'] = 1;
@@ -2088,7 +2088,7 @@ class QueryController extends BaseController
     public function getGameServers()
     {
         $gameId = I('game_id', 0);
-        $servers = M('server', 'tab_')->field(['id', 'server_id', 'server_name'])->where(['game_id' => $gameId])->select();
+        $servers = M('server', 'tab_')->field(['id', 'server_id', 'server_name'])->where(['game_id' => $gameId])->order('server_id asc')->select();
         $this->ajaxReturn([
             'status' => 1,
             'msg' => '成功',

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

@@ -235,7 +235,7 @@
 <script type="text/javascript" src="__JS__/20170831/tabpage.js"></script>
 <eq name='timeout' value='1'>
 <script>
-  layer.msg('时间间隔不能超过90天');
+  layer.msg('时间间隔不能超过30天');
 </script>
 </eq>
 <script>