From ef975943bbe3485ea3f2722913c3c407209a9d03 Mon Sep 17 00:00:00 2001
From: liuweiwen <“529520975@qq.com>
Date: Tue, 14 Jan 2020 15:54:42 +0800
Subject: [PATCH] =?UTF-8?q?=E9=92=88=E5=AF=B9admin=E7=9A=84=E5=90=8E?=
 =?UTF-8?q?=E5=8F=B0=E8=B4=A6=E5=8F=B7=E5=AF=B9=E6=B8=B8=E6=88=8F=E5=85=85?=
 =?UTF-8?q?=E5=80=BC=E5=92=8C=E8=A7=92=E8=89=B2=E6=9F=A5=E8=AF=A2=E5=81=9A?=
 =?UTF-8?q?=E5=AE=8C=E5=85=A8=E8=AE=BF=E9=97=AE=E6=9D=83=E9=99=90=EF=BC=8C?=
 =?UTF-8?q?=E6=B2=A1=E5=AE=8C=E5=85=A8=E8=AE=BF=E9=97=AE=E6=9D=83=E9=99=90?=
 =?UTF-8?q?=E6=97=B6=E5=BF=85=E9=A1=BB=E9=80=9A=E8=BF=87=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=E6=89=8D=E6=98=BE=E7=A4=BA=E7=BB=93=E6=9E=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Admin/Controller/SpendController.class.php | 1 +
 Application/Admin/Controller/UserController.class.php  | 5 +++++
 Application/Admin/View/User/rolelist.html              | 3 +++
 3 files changed, 9 insertions(+)

diff --git a/Application/Admin/Controller/SpendController.class.php b/Application/Admin/Controller/SpendController.class.php
index a90a2a13f..d4f4d7821 100644
--- a/Application/Admin/Controller/SpendController.class.php
+++ b/Application/Admin/Controller/SpendController.class.php
@@ -111,6 +111,7 @@ class SpendController extends ThinkController
         //     $map = '1 = 2';
         //     $map1 = $map;
         // }
+        $this->checkListOrCountAuthRestMap($map,["extend", "pay_order_number", "user_account"]);
         $map1 = $map;
         $map1['pay_status'] = 1;
         $total = null_to_0(D(self::model_name)->where($map1)->sum('pay_amount'));
diff --git a/Application/Admin/Controller/UserController.class.php b/Application/Admin/Controller/UserController.class.php
index 9ce267470..6f9d23912 100644
--- a/Application/Admin/Controller/UserController.class.php
+++ b/Application/Admin/Controller/UserController.class.php
@@ -631,6 +631,10 @@ class UserController extends AdminController
             $map['role_name'] = trim($_REQUEST['role_name']);
             unset($_REQUEST['role_name']);
         }
+        if (isset($_REQUEST['role_id'])) {
+            $map['role_id'] = trim($_REQUEST['role_id']);
+            unset($_REQUEST['role_id']);
+        }
 
 //        $promoteRoot = getPowerPromoteIds();
 //        $data_empower_type = session('user_auth')['data_empower_type'];
@@ -668,6 +672,7 @@ class UserController extends AdminController
 
 
         empty(I('user_account')) || $map['user_account'] = ['like', "%" . I('user_account') . "%"];
+        $this->checkListOrCountAuthRestMap($map,["role_id", "role_name", "user_account"]);
         $list = $this->lists(M('user_play_info', 'tab_'), $map, 'play_time desc');
         $this->assign('list', $list);
         $this->meta_title = '角色数据';
diff --git a/Application/Admin/View/User/rolelist.html b/Application/Admin/View/User/rolelist.html
index d94296fd7..8c16ce304 100644
--- a/Application/Admin/View/User/rolelist.html
+++ b/Application/Admin/View/User/rolelist.html
@@ -59,6 +59,9 @@
             <div class="input-list">
                 <input type="text" name="role_name" class="" value="{:I('role_name')}" placeholder="角色名称">&nbsp;&nbsp;&nbsp;
             </div>
+            <div class="input-list">
+                <input type="text" name="role_id" class="" value="{:I('role_id')}" placeholder="角色ID">&nbsp;&nbsp;&nbsp;
+            </div>
             <div class="input-list input-list-game search_label_rehab">
                 <select id="game_name" name="game_name" class="select_gallery" >
                     <option value="">游戏名称</option>