权限

app/v1/logic/dataReport/AnalyseLogic.php

@@ -132,7 +132,7 @@ class AnalyseLogic extends BaseLogic
                 $whereSql .= " OR (game_id = {$params['nomal_game_id'][$i]} AND agent_id=1000)";
             }
         }
-        
+
         return $whereSql;
     }
 
@@ -327,7 +327,9 @@ class AnalyseLogic extends BaseLogic
     public function getDataOverview($where)
     {
         $params = $this->searchByAuth($where);
+        print_r($params);
         $whereSql = $this->generateWhereSql($params);
+        echo $whereSql;
         // 基础汇总信息
         $field = "
       SUM(login_total) AS login_total,  -- 登陆总数

app/v1/middleware/FilterPermission.php

@@ -25,34 +25,30 @@ class FilterPermission implements MiddlewareInterface
 
         // 获取游戏数据权限
         if(in_array(1,$currentUserRoleList)){
-            $authGameList = '*';
+            $authGameList = '';
         }else{
             $authGameList = $user_info['game_list'] ?? '';
         }
 
         // 获取游戏自然量数据权限
         if(in_array(1,$currentUserRoleList)){
-            // 如果是管理员，则不限制自然量数据权限
-            // 需要请求所有游戏ID
-            $gameData = Db::connect('db_center')->table('pf_game')->where('status',1)->select()->toArray();
-            $game_list = array_column($gameData, 'id');
-            $auth_normal_game_list = array_values($game_list);
+            $auth_normal_game_list = '';
         }else{
             $auth_normal_game_list = $user_info['normal_game_list'] ?? '';
         }
 
         // 获取广告投放数据权限
         if(in_array(1,$currentUserRoleList)){
-            $auth_ad_permission = '*';
+            $auth_ad_permission = 1;
         }else{
             $auth_ad_permission = $user_info['ad_permission'] ?? '';
         }
 
         // 追加参数逻辑
         $extraParams = [
-            'auth_normal_game_list' => $auth_normal_game_list === '*' ? '' : $auth_normal_game_list,
-            'auth_game_list' => $authGameList === '' ? '' : $authGameList,
-            'auth_ad_permission' => $auth_ad_permission === '*' ? 1 : $auth_ad_permission,
+            'auth_normal_game_list' => $auth_normal_game_list,
+            'auth_game_list' => $authGameList,
+            'auth_ad_permission' =>$auth_ad_permission,
         ];
        
         // 合并并设置回 request

plugin/saiadmin/basic/BaseLogic.php

@@ -198,7 +198,12 @@ class BaseLogic
            
         // 自然量游戏权限
         if(!empty($auth_normal_game_list)){
-            $data['nomal_game_id'] = $auth_normal_game_list;
+            // 如果传入了game_id，则取auth_normal_game_list交集
+            if(!empty($data['game_id'])){
+                $data['nomal_game_id'] = array_values(array_intersect($auth_normal_game_list, $data['game_id']));
+            }else{
+                $data['nomal_game_id'] = $auth_normal_game_list ? explode(',', $auth_normal_game_list) : '';
+            }
         }
 
         /**广告数据权限-开始***************************************** */