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-01-05 10:58:23 +08:00
parent 201843817a
commit 6784f78323
2 changed files with 52 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -350,7 +350,6 @@ class Journal extends Controller {
->where('j_article.type', ['like', 'News'], ['like', 'Comment'], 'or') ->where('j_article.type', ['like', 'News'], ['like', 'Comment'], 'or')
->order('j_article.article_id') ->order('j_article.article_id')
->select(); ->select();
//获取作者 //获取作者
foreach ($list as $k => $v) { foreach ($list as $k => $v) {
$stage_info = $this->journal_stage_obj->where('journal_stage_id',$v['journal_stage_id'])->find(); $stage_info = $this->journal_stage_obj->where('journal_stage_id',$v['journal_stage_id'])->find();

21
application/api/controller/Main.php
View File

@@ -11,6 +11,7 @@ use think\Db;
* @group 前段web接口 * @group 前段web接口
*/ */
class Main extends Controller { class Main extends Controller {
//put your code here //put your code here
protected $admin_obj = ''; protected $admin_obj = '';
protected $journal_obj = ''; protected $journal_obj = '';
@@ -149,12 +150,6 @@ class Main extends Controller{
return jsonSuccess($re); return jsonSuccess($re);
} }
public function test(){
echo 'ookkjjhhgg';
}
/** /**
* @title 获取查找文章列表 * @title 获取查找文章列表
* @description 获取查找文章列表 * @description 获取查找文章列表
@@ -176,15 +171,6 @@ class Main extends Controller{
*/ */
public function getSearchArt() { public function getSearchArt() {
$data = $this->request->post(); $data = $this->request->post();
// $data['journals'] = '1,2,3';
// $data['condition1'] = 'title';
// $data['condition1_text'] = '1';
// $data['relation'] = 'or';
// $data['condition2'] = 'keywords';
// $data['condition2_text'] = '1';
// $data['pageIndex'] = 1;
// $data['pageSize'] = 12;
$where = "j_article.journal_id in (" . $data['journals'] . ")"; $where = "j_article.journal_id in (" . $data['journals'] . ")";
if ($data['condition2_text'] != '') { if ($data['condition2_text'] != '') {
if ($data['relation'] == 'and') { if ($data['relation'] == 'and') {
@@ -211,6 +197,7 @@ class Main extends Controller{
$re['journals'] = $list; $re['journals'] = $list;
return jsonSuccess($re); return jsonSuccess($re);
} }
private function getAuthor($article) { private function getAuthor($article) {
$where['article_id'] = $article['article_id']; $where['article_id'] = $article['article_id'];
$where['state'] = 0; $where['state'] = 0;
@@ -222,4 +209,8 @@ class Main extends Controller{
return $frag; return $frag;
} }
public function test() {
echo md5('123456');
}
} }