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

1

Browse Source
This commit is contained in:
wangjinlei
2025-01-17 09:46:41 +08:00
parent 4c8331ee91
commit 927ddabbf9
2 changed files with 34 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
application/api/controller/Journal.php
View File

@@ -890,7 +890,6 @@ class Journal extends Controller {
->order("cited_num desc")
->limit($limit_start,$data['pageSize'])
->select();
// echo $this->article_obj->getLastSql();
$count = $this->article_obj
->join("j_journal_stage",'j_article.journal_stage_id = j_journal_stage.journal_stage_id', 'LEFT')
->join("j_article_cite","j_article_cite.article_id = j_article.article_id","left")
@@ -903,34 +902,26 @@ class Journal extends Controller {
->having("count(j_article_cite.article_cite_id) > 3")
->count();
}else{
$list = [];
$count = 0;
$list = $this->article_obj
->join("j_journal_stage","j_journal_stage.journal_stage_id = j_article.journal_stage_id","left")
->where('j_article.journal_id', $data['journal_id'])
->where('j_article.state', 0)
->where("j_journal_stage.stage_year",">",date("Y")-6)
->where('j_journal_stage.is_publish', 1)
->orderRaw("(j_article.abs_num + j_article.pdf_num + j_article.html_num) desc")
->limit($limit_start,$data['pageSize'])
->select();
$count = $this->article_obj
->join("j_journal_stage","j_journal_stage.journal_stage_id = j_article.journal_stage_id","left")
->where('j_article.journal_id', $data['journal_id'])
->where('j_article.state', 0)
->where("j_journal_stage.stage_year",">",date("Y")-6)
->where('j_journal_stage.is_publish', 1)
->count();
if($count>30){
$count = 30;
}
}
// $list = $this->article_obj
// ->field("j_article.*,count(j_article_cite.article_id) as cited_num")
// ->join("j_journal_stage",'j_article.journal_stage_id = j_journal_stage.journal_stage_id', 'LEFT')
// ->join("j_article_cite","j_article_cite.article_id = j_article.article_id","left")
// ->where('j_article.journal_id', $data['journal_id'])
// ->where('j_article.state', 0)
// ->where('j_journal_stage.is_publish', 1)
// ->group("j_article.article_id")
// ->order("cited_num desc")
// ->limit($limit_start,$data['pageSize'])
// ->select();
//
// $count = $this->article_obj
// ->join("j_journal_stage",'j_article.journal_stage_id = j_journal_stage.journal_stage_id', 'LEFT')
//// ->join("j_article_cite","j_article_cite.article_id = j_article.article_id","left")
// ->where('j_article.journal_id', $data['journal_id'])
// ->where('j_article.state', 0)
// ->where('j_journal_stage.is_publish', 1)
// ->group("j_article.article_id")
// ->count();
//
// if($count>100){//只显示前50片
// $count = 100;
// }
$re['articles'] = strongArticleList($list);
$re['count'] = $count;
return jsonSuccess($re);

15
application/common.php
View File

@@ -207,9 +207,22 @@ function hasHtml($article_id){
$article_obj = Db::name("article");
$article_info = $article_obj->where("article_id",$article_id)->find();
$list = $article_main_obj->where('article_id', $article_id)->where('state', 0)->where('is_add', 0)->find();
if($article_info['file_html']!=""||$article_info['html_type']==2||$list){
if($article_info['file_html']!=""||$list){
return 1;
}elseif ($article_info['html_type']==2){
if($article_id>3435){
return 1;
}else{
$url = "http://api.tmrjournals.com/public/index.php/api/Web/checkArticleMain";
$program['article_id'] = $article_id;
$res = object_to_array(json_decode(myPost($url, $program)));
if(isset($res['data']['check'])){
return $res['data']['check'];
}else{
return 0;
}
}
} else{
return 0;
}
}