From 281605436144032fcc1923b46ad55e4f5bf89712 Mon Sep 17 00:00:00 2001
From: ELF <360197197@qq.com>
Date: Tue, 22 Oct 2019 18:33:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Base/Repository/PromoteRepository.class.php | 6 +++++-
 Application/Home/Controller/QueryController.class.php   | 6 +++---
 Application/Home/View/default/Query/arpu.html           | 2 +-
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/Application/Base/Repository/PromoteRepository.class.php b/Application/Base/Repository/PromoteRepository.class.php
index 514f7a734..ed7704485 100644
--- a/Application/Base/Repository/PromoteRepository.class.php
+++ b/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) {
-                $map['user_id'] = ['not in', $lockUserIds];
+                if ($params['lock_status'] == 1) {
+                    $map['user_id'] = ['not in', $lockUserIds];
+                } else {
+                    $map['user_id'] = ['in', $lockUserIds];
+                }
             }
         }
         return $map;
diff --git a/Application/Home/Controller/QueryController.class.php b/Application/Home/Controller/QueryController.class.php
index 8c36d5835..d5b30fd31 100644
--- a/Application/Home/Controller/QueryController.class.php
+++ b/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' => '成功',
diff --git a/Application/Home/View/default/Query/arpu.html b/Application/Home/View/default/Query/arpu.html
index cbd0971e5..546ef5c88 100644
--- a/Application/Home/View/default/Query/arpu.html
+++ b/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>