合并分支 'akun' 到 'master'

Akun



查看合并请求 !3350

@@ -144,19 +144,26 @@ class GeoQuestionLogic extends BaseLogic
      * @date 2025/11/25 16:44
      */
     public function getUnHitQuestionList(){
-        $data = GeoQuestionResult::where('project_id',$this->param['project_id'])->where('hit',0)->pluck('platform','question')->toArray();
+        $data = GeoQuestionResult::where('project_id',$this->param['project_id'])->where('hit',0)->select('platform','question')->get()->toArray();
         $list = [];
         if(!empty($data)){
+            $temp = [];
             $question_list = [];
-            foreach ($data as $key => $item){
-                if(in_array($key,$question_list)){
-                    array_push($list[$key],$item);
+            foreach ($data as $item){
+                if(in_array($item['question'],$question_list)){
+                    array_push($temp[$item['question']],$item['platform']);
                 }else{
-                    $list[$key] = $item;
-                    $question_list[] = $key;
+                    $temp[$item['question']][] = $item['platform'];
+                    $question_list[] = $item['question'];
+                }
+            }
+
+            if(!empty($temp)){
+                foreach ($temp as $kt=>$vt){
+                    $list[] = ['question'=>$kt,'platform'=>$vt];
                 }
             }
         }
-        return $this->success($data);
+        return $this->success($list);
     }
 }