From 0be7e54304213ba06c0d2ea548a0e8a8c4edc6a1 Mon Sep 17 00:00:00 2001
From: wangjinlei <751475802@qq.com>
Date: Fri, 18 Aug 2023 09:45:52 +0800
Subject: [PATCH] 1

---
 application/api/controller/Journal.php    | 4 ++++
 application/api/controller/Main.php       | 2 +-
 application/master/controller/Article.php | 8 ++++++++
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/application/api/controller/Journal.php b/application/api/controller/Journal.php
index d09da59..b610f7a 100644
--- a/application/api/controller/Journal.php
+++ b/application/api/controller/Journal.php
@@ -39,6 +39,7 @@ class Journal extends Controller {
     protected $footer_obj = '';
     protected $journal_for_author;
     protected $journal_for_author_yc_obj = '';
+    protected $article_main_obj = '';
 
     public function __construct(\think\Request $request = null) {
         parent::__construct($request);
@@ -66,6 +67,7 @@ class Journal extends Controller {
         $this->footer_obj = Db::name('footer');
         $this->journal_for_author = Db::name('journal_for_author');
         $this->journal_for_author_yc_obj = Db::name('journal_for_author_yc');
+        $this->article_main_obj = Db::name("article_main");
     }
 
     /**
@@ -633,6 +635,8 @@ class Journal extends Controller {
             }
             $list[$k]['title'] = $cache_title;
             $list[$k]['mains'] = [];//getArticleMains($v['article_id']);
+            $cm = $this->article_main_obj->where('article_id',$v['article_id'])->where('state',0)->find();
+            $list[$k]['has_mains'] = $cm?1:0;
         }
 
         //获取作者
diff --git a/application/api/controller/Main.php b/application/api/controller/Main.php
index 986a71c..addfa9a 100644
--- a/application/api/controller/Main.php
+++ b/application/api/controller/Main.php
@@ -407,7 +407,7 @@ class Main extends Controller {
 //        $push_url = 'http://www.journal.com/api/Main/getImgFile';
         
         //定义需要查询同化的数组
-        $list = ['articleCite','articlePDF','articleicon','articleSUB','boardIcon','articleSUB2','baseTopic','journalCfp','journalstage','journalfooter','journalicon','journalline','rotation','journaltopic','specialIcon','system','articleCDF'];
+        $list = ['articleCite','articlePDF','articleicon','articleOriginal','articleSUB','boardIcon','articleSUB2','baseTopic','journalCfp','journalstage','journalfooter','journalicon','journalline','rotation','journaltopic','specialIcon','system','articleCDF'];
         
         foreach ($list as  $v){
             $dir = $root_url."public/".$v."/".date('Ymd');
diff --git a/application/master/controller/Article.php b/application/master/controller/Article.php
index 2e9435e..fe5aabc 100644
--- a/application/master/controller/Article.php
+++ b/application/master/controller/Article.php
@@ -447,6 +447,14 @@ class Article extends Controller
             $co = @copy("http://api.tmrjournals.com/public/articleCDF/" . $data['file_cdf'], ROOT_PATH . 'public' . DS . 'articleCDF' . DS . date('Ymd') . DS . $cfile_name);
             $insert['file_cdf'] = date('Ymd') . DS . $cfile_name;
         }
+        if (isset($data['file_original']) && $data['file_original'] != '') {
+            $cfile_name = substr($data['file_original'], strripos($data['file_original'], '/') + 1);
+            if (!is_dir(ROOT_PATH . 'public' . DS . 'articleOriginal' . DS . date('Ymd'))) {
+                mkdir(ROOT_PATH . 'public' . DS . 'articleOriginal' . DS . date('Ymd'));
+            }
+            $co = @copy("http://api.tmrjournals.com/public/articleOriginal/" . $data['file_original'], ROOT_PATH . 'public' . DS . 'articleOriginal' . DS . date('Ymd') . DS . $cfile_name);
+            $insert['file_original'] = date('Ymd') . DS . $cfile_name;
+        }
         if (isset($data['endnote']) && $data['endnote'] != '') {
             $cfile_name = substr($data['endnote'], strripos($data['endnote'], '/') + 1);
             if (!is_dir(ROOT_PATH . 'public' . DS . 'endNote' . DS . date('Ymd'))) {