合并分支 'lyh-server' 到 'master'

变更数据



查看合并请求 !3060

@@ -135,16 +135,23 @@ class GeoQuestionResLogic extends BaseLogic
             ];
             ];
         }else{
         }else{
             $keywordUrlCount = $questionLogModel->counts(['project_id'=>$this->user['project_id'],'hit'=>['!=',0]]);
             $keywordUrlCount = $questionLogModel->counts(['project_id'=>$this->user['project_id'],'hit'=>['!=',0]]);
+            $keywordArrs = [];
+            $urlArrs = [];
             foreach ($list as $item){
             foreach ($list as $item){
+                $keywordArrs = array_merge($keywordArrs,$item['keywords'] ?? []);
+                $urlArrs = array_merge($urlArrs,$item['url'] ??[]);
                 $questionTotalCount += count($item['question'] ?? []);
                 $questionTotalCount += count($item['question'] ?? []);
-                $keywordsTotalCount += count($item['keywords'] ?? []);
-                $urlTotalCount += count($item['url'] ?? []);
                 foreach ($item['keywords'] as $keyWordItem){
                 foreach ($item['keywords'] as $keyWordItem){
                     if (!array_key_exists($keyWordItem, $keywordArr)) {
                     if (!array_key_exists($keyWordItem, $keywordArr)) {
                         $keywordArr[$keyWordItem] = $questionLogModel->counts(['project_id'=>$this->user['project_id'],'keywords'=>['like','%"'.$keyWordItem.'"%']]);
                         $keywordArr[$keyWordItem] = $questionLogModel->counts(['project_id'=>$this->user['project_id'],'keywords'=>['like','%"'.$keyWordItem.'"%']]);
                     }
                     }
                 }
                 }
             }
             }
+            // 去重
+            $keywordArrs = array_unique($keywordArrs);
+            $keywordsTotalCount = count($keywordArrs);
+            $urlArrs = array_unique($urlArrs);
+            $urlTotalCount = count($urlArrs);
             $data = [
             $data = [
                 'question_count'=>$questionTotalCount,
                 'question_count'=>$questionTotalCount,
                 'keywords_count'=>$keywordsTotalCount,
                 'keywords_count'=>$keywordsTotalCount,