From 7c8c1cbff07f429fb2d59df0acffa586ceda507d Mon Sep 17 00:00:00 2001
From: wangzhaocui <18722597281>
Date: Thu, 7 Apr 2022 11:08:23 +0800
Subject: [PATCH] =?UTF-8?q?=E9=82=AE=E7=AE=B1=E6=B6=88=E6=81=AF=E9=98=9F?=
 =?UTF-8?q?=E5=88=97=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/api/controller/Admin.php   | 4 ++--
 application/api/controller/Article.php | 9 +++++++--
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/application/api/controller/Admin.php b/application/api/controller/Admin.php
index 5246734..318f729 100644
--- a/application/api/controller/Admin.php
+++ b/application/api/controller/Admin.php
@@ -316,7 +316,7 @@ class Admin extends Controller {
                 'content'=>$tt,//邮件内容
                 'user_id'=>$editor_info['user_id'], //收件人ID
                 'email'=>$editor_info['email'],// 收件人邮箱
-                'journal_id'=>0, // 期刊ID
+                'journal_id'=>$journal_info['journal_id'], // 期刊ID
                 'sendEmail'=>$journal_info['email'], // 期刊邮箱
                 'sendPassword'=>$journal_info['epassword'], // 期刊密码
                 'from_name'=>$journal_info['title']
@@ -368,7 +368,7 @@ class Admin extends Controller {
             'content'=>$tt,//邮件内容
             'user_id'=>$editor_info['user_id'], //收件人ID
             'email'=>$editor_info['email'],// 收件人邮箱
-            'journal_id'=>0, // 期刊ID
+            'journal_id'=>$journal_info['journal_id'], // 期刊ID
             'sendEmail'=>$journal_info['email'], // 期刊邮箱
             'sendPassword'=>$journal_info['epassword'], // 期刊密码
             'from_name'=>$journal_info['title']
diff --git a/application/api/controller/Article.php b/application/api/controller/Article.php
index 389d216..e2248b7 100644
--- a/application/api/controller/Article.php
+++ b/application/api/controller/Article.php
@@ -744,8 +744,8 @@ class Article extends Controller {
         // 发送邮件内容
         $sendUser=[
             'title'=> $journal_info['title'], // 邮件标题
-            'user_id'=>$user_info['user_id'], //收件人ID
-            'email'=>$user_info['email'],// 收件人邮箱
+            'user_id'=>$user_info['user_id'],
+            'email'=>$user_info['email'],
             'journal_id'=>$journal_info['journal_id'], // 期刊ID
             'sendEmail'=>$journal_info['email'], // 期刊邮箱
             'sendPassword'=>$journal_info['epassword'], // 期刊密码
@@ -784,6 +784,9 @@ class Article extends Controller {
             $tt .= '<a href="https://www.tmrjournals.com/draw_up.html?issn='.$journal_info['issn'].'">Subscribe to this journal</a><br>';
             $tt .= 'Email: '.$journal_info['email'].'<br>';
             $tt .= 'Website: '.$tran_journal['website'];
+
+            $sendUser['user_id'] = $user_info['user_id'];
+            $sendUser['email'] = $user_info['email'];
             $sendUser['content'] = $tt;
             Queue::push('app\api\job\domail@fire',$sendUser,'domail');
 
@@ -794,6 +797,8 @@ class Article extends Controller {
             //$tt1 .= 'Please check the new transfer manuscript in the submission system.';
             //sendEmail($trans_editor_info['email'],$journal_info['title'], $journal_info['title'], $tt1, $journal_info['email'], $journal_info['epassword']);
 
+            $sendUser['user_id'] = $trans_editor_info['user_id'];
+            $sendUser['email'] = $trans_editor_info['email'];
             $sendUser['content'] = 'Dear editor,Please check the new transfer manuscript in the submission system.';
             Queue::push('app\api\job\domail@fire',$sendUser,'domail');