ith5 6 месяцев назад
Родитель
Сommit
088a056e13

+ 1 - 0
app/v1/controller/center/GameController.php

@@ -47,6 +47,7 @@ class GameController extends BaseController
             ['os', ''],
             ['status', ''],
         ]);
+        
         $list = $this->logic->getIndex($where);
        
         return $this->success($list);

+ 2 - 1
app/v1/logic/center/GameLogic.php

@@ -41,8 +41,9 @@ class GameLogic extends BaseLogic
 
         $data = $this->getList($query);
 
+        $mainGameMap = $this->gameMainLogic->getMainGameMap();
         foreach ($data['data'] as $key => $value) {
-            $data['data'][$key]['main_game_name'] = $this->gameMainLogic->getMainGameNameById($value['main_id']);
+            $data['data'][$key]['main_game_name'] = $mainGameMap[$value['main_id']] ?? '';
         }
         return $data;
     }

+ 10 - 1
app/v1/middleware/FilterPermission.php

@@ -13,6 +13,8 @@ class FilterPermission implements MiddlewareInterface
 {
     public function process(Request $request, callable $handler) : Response
     {
+        $originalGet = $request->get();
+
         // 根据用户id获取用户权限
         $token = getCurrentInfo();
         // 用户权限缓存
@@ -28,8 +30,15 @@ class FilterPermission implements MiddlewareInterface
         // 获取游戏自然量数据权限
         $auth_ad_permission = $user_info['ad_permission'] ?? -1;
 
-        $request->setGet(['auth_normal_game_list' => $auth_normal_game_list==='*'?'':$auth_normal_game_list,'auth_game_list' => $auth_game_list==='*'?'':$auth_game_list,'auth_ad_permission' => $auth_ad_permission==='*'?'':$auth_ad_permission]);
+        // 追加参数逻辑
+        $newParams = [
+            'auth_normal_game_list' => $auth_normal_game_list === '*' ? '' : $auth_normal_game_list,
+            'auth_game_list' => $auth_game_list === '*' ? '' : $auth_game_list,
+            'auth_ad_permission' => $auth_ad_permission === '*' ? '' : $auth_ad_permission,
+        ];
        
+       // 合并并设置回 request
+       $request->setGet(array_merge($originalGet, $newParams));
 
         return $handler($request);
     }