zm/journal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

20201112

Browse Source
This commit is contained in:
wangjinlei
2021-07-02 18:04:27 +08:00
parent a34439b183
commit 7f95e7ec98
6 changed files with 539 additions and 318 deletions
Download Patch File Download Diff File Expand all files Collapse all files

786
application/master/controller/Article.php
View File

File diff suppressed because one or more lines are too long

12
application/master/controller/Journal.php
View File

@@ -663,7 +663,13 @@ class Journal extends Controller {
$stage_info = $this->journal_stage_obj->where('journal_stage_id', $article_info['journal_stage_id'])->find();
$topic_info = $this->journal_topic_obj->where('journal_topic_id',$topic_id)->find();
$journal_info = $this->journal_obj->where('journal_id',$article_info['journal_id'])->find();
$list = $this->subscribe_topic_obj->where('topic_id',$topic_id)->where('state',0)->select();
$list = [];
if($topic_info['level']==2){
$list = $this->subscribe_topic_obj->where('topic_id',$topic_id)->where('state',0)->select();
}else{
$list = $this->subscribe_topic_obj->where('topic_id',$topic_info['parent_id'])->where('state',0)->select();
}
// $list = $this->subscribe_topic_obj->where('topic_id',$topic_info['parent_id'])->where('state',0)->select();
//组成文章信息
$tt1 = '<div style="background-color: #ededed;margin: 0;">
<div class="con_content" style="font-family: Arial;
@@ -699,7 +705,7 @@ class Journal extends Controller {
$maidata['title'] = $journal_info['title'];
$maidata['content'] = $cache;
$maidata['tmail'] = 'publicrelations@tmrjournals.com';
$maidata['tpassword'] = 'pRWU999999';
$maidata['tpassword'] = '999999Wu';
Queue::push('app\api\job\mail@fire', $maidata, "mail");
}
}
@@ -1071,7 +1077,7 @@ class Journal extends Controller {
$maidata['title'] = $journal_info['title'];
$maidata['content'] = $cache;
$maidata['tmail'] = 'publicrelations@tmrjournals.com';
$maidata['tpassword'] = 'pRWU999999';
$maidata['tpassword'] = '999999Wu';
Queue::push('app\api\job\mail@fire', $maidata, "mail");
echo $v['email'];
}