修改

Application/Admin/Controller/MemberController.class.php

@@ -79,16 +79,7 @@ class MemberController extends ThinkController
             $is_repeat = true;
         }
 
-        $marketAdminId = I('market_admin_id', 0);
-        if ($marketAdminId) {
-            $map['promote.admin_id'] = $marketAdminId;
-        }
-
-        $isMarketAdmin = isMarketAdmin();
-        if ($isMarketAdmin) {
-            $userAuth = session('user_auth');
-            $map['promote.admin_id'] = $userAuth['uid'];
-        }
+        $map = withMarketAdminCondition($map, I('market_admin_id', 0));
 
         if (isset($_REQUEST['status'])) {
             $map['lock_status'] = $_REQUEST['status'];
@@ -141,7 +132,7 @@ class MemberController extends ThinkController
             }
         }
         //判断是否有列表和统计的权限
-        $this->checkListOrCountAuthRestMap($map,["tab_user.id","tab_user.account","tab_user.device_number"]);
+        // $this->checkListOrCountAuthRestMap($map,["tab_user.id","tab_user.account","tab_user.device_number"]);
         //计算用户列表
         $data =  M("user","tab_")
         ->field("tab_user.id,`device_number`,`age_status`,tab_user.account,`balance`,`gold_coin`,`alipay`,tab_user.promote_id,`register_type`,tab_user.promote_account,`register_time`,`lock_status`,lock_remark,

Application/Admin/Controller/UserController.class.php

@@ -677,7 +677,6 @@ class UserController extends AdminController
     //            $map['id'] = array('lt',1);
     //        }
         setPowerPromoteIds($map,'promote_id');
-
         if (isset($_REQUEST['promote_id'])) {
             $queryStr = '';
             if ($_REQUEST['promote_id'] == 0) {
@@ -693,7 +692,7 @@ class UserController extends AdminController
             $map['sdk_version'] = trim($_REQUEST['game_type']);
             unset($_REQUEST['game_type']);
         }
-
+        
         if (isset($_REQUEST['time_start']) && isset($_REQUEST['time_end'])) {
             $map['create_time'] = ['between', [strtotime(I('time_start')), strtotime(I('time_end')) + 86399]];
         } elseif (isset($_REQUEST['time_start'])) {
@@ -701,10 +700,10 @@ class UserController extends AdminController
         } elseif (isset($_REQUEST['time_end'])) {
             $map['create_time'] = ['LT', strtotime(I('time_end')) + 86399];
         }
-
-
+        
+        
         empty(I('user_account')) || $map['user_account'] = ['like', "%" . I('user_account') . "%"];
-        $this->checkListOrCountAuthRestMap($map,["role_id", "role_name", "user_account"]);
+        // $this->checkListOrCountAuthRestMap($map,["role_id", "role_name", "user_account"]);
         $list = $this->lists(M('user_play_info', 'tab_'), $map, 'play_time desc');
 
         $adminList = getMarketAdminsByPromoteIds(array_column($list, 'promote_id'));