From 73f5f4f5ea152952490bc00e78ce08d23ea012a4 Mon Sep 17 00:00:00 2001
From: ELF <360197197@qq.com>
Date: Sun, 28 Jun 2020 21:01:07 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Admin/Controller/MemberController.class.php | 2 +-
 Application/Admin/Controller/SpendController.class.php  | 2 +-
 Application/Admin/Controller/UserController.class.php   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Application/Admin/Controller/MemberController.class.php b/Application/Admin/Controller/MemberController.class.php
index 2a72c9c48..9f8fe7ba7 100644
--- a/Application/Admin/Controller/MemberController.class.php
+++ b/Application/Admin/Controller/MemberController.class.php
@@ -78,7 +78,7 @@ class MemberController extends ThinkController
             $map['tab_user.is_repeat'] = $_REQUEST['is_repeat'];
             $is_repeat = true;
         }
-
+        $isMarketAdmin = isMarketAdmin();
         $map = withMarketAdminCondition($map, I('market_admin_id', 0));
 
         if (isset($_REQUEST['status'])) {
diff --git a/Application/Admin/Controller/SpendController.class.php b/Application/Admin/Controller/SpendController.class.php
index cc1c4a612..60cc441be 100644
--- a/Application/Admin/Controller/SpendController.class.php
+++ b/Application/Admin/Controller/SpendController.class.php
@@ -122,7 +122,7 @@ class SpendController extends ThinkController
         //     $map = '1 = 2';
         //     $map1 = $map;
         // }
-        $this->checkListOrCountAuthRestMap($map,["extend", "pay_order_number", "user_account"]);
+        // $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 dcef8d90c..b5d677105 100644
--- a/Application/Admin/Controller/UserController.class.php
+++ b/Application/Admin/Controller/UserController.class.php
@@ -665,7 +665,7 @@ class UserController extends AdminController
             $map['role_id'] = trim($_REQUEST['role_id']);
             unset($_REQUEST['role_id']);
         }
-
+        $isMarketAdmin = isMarketAdmin();
         $map = withMarketAdminCondition($map, I('market_admin_id', 0));
         
         //        $promoteRoot = getPowerPromoteIds();