From cf5fc9d87f556104be26ca7fb3535794275865be Mon Sep 17 00:00:00 2001
From: wangjinlei <751475802@qq.com>
Date: Tue, 3 Sep 2024 16:32:18 +0800
Subject: [PATCH] 1

---
 application/api/controller/Article.php   |  2 +-
 application/super/controller/Publish.php | 15 ++++++++++-----
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/application/api/controller/Article.php b/application/api/controller/Article.php
index ee8a033..e6a9287 100644
--- a/application/api/controller/Article.php
+++ b/application/api/controller/Article.php
@@ -260,7 +260,7 @@ class Article extends Controller {
             ->field("j_article.*")
             ->join("j_journal_stage","j_journal_stage.journal_stage_id = j_article.journal_stage_id","left")
             ->where("j_article.article_id", "in", object_to_array(json_decode($article_info['related'])))
-            ->where("j_journal_stage.stage_year",">",date("Y")-2)
+//            ->where("j_journal_stage.stage_year",">",date("Y")-2)
             ->where('j_article.state', 0)
             ->select();
         if ($article_info['keywords'] != '' && count($res_rel) < 5) {
diff --git a/application/super/controller/Publish.php b/application/super/controller/Publish.php
index 830042d..42729bc 100644
--- a/application/super/controller/Publish.php
+++ b/application/super/controller/Publish.php
@@ -760,7 +760,7 @@ class Publish extends Controller {
     public function getCiteDate() {
         $data = $this->request->post();
 //        $data['journal_id'] = 1;
-        $list = $this->article_cite_obj->where('journal_id', $data['journal_id'])->select();
+        $list = $this->article_cite_obj->where('journal_id', $data['journal_id'])->where("state",1)->where("is_wos",1)->select();
         $frag = [];
         $frag['country'] = [];
         $frag['topic'] = [];
@@ -770,12 +770,17 @@ class Publish extends Controller {
         foreach ($list as $v) {
             $cache_article = $this->article_obj->where('article_id', $v['article_id'])->find();
             //判断国家
-            $cou_res = $this->checkCountry($cache_article);
-            if ($cou_res == 'n') {
-                isset($frag['country']['n']) ? $frag['country']['n']++ : $frag['country']['n'] = 1;
-            } else {
+            if($v['is_china']==2){
                 isset($frag['country']['w']) ? $frag['country']['w']++ : $frag['country']['w'] = 1;
+            }else{
+                isset($frag['country']['n']) ? $frag['country']['n']++ : $frag['country']['n'] = 1;
             }
+//            $cou_res = $this->checkCountry($cache_article);
+//            if ($cou_res == 'n') {
+//                isset($frag['country']['n']) ? $frag['country']['n']++ : $frag['country']['n'] = 1;
+//            } else {
+//                isset($frag['country']['w']) ? $frag['country']['w']++ : $frag['country']['w'] = 1;
+//            }
             //判断领域
             $topic_res = $this->checkTopic($cache_article);
             foreach ($topic_res as $key => $val) {