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
2022-11-02 17:04:30 +08:00
parent 2b40bbbe12
commit 64e4448ce2
2 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
application/master/controller/Board.php
View File

@@ -75,12 +75,17 @@ class Board extends Controller {
}
$journal_info = $this->journal_obj->where('issn',$data['issn'])->find();
$where['journal_id'] = $journal_info['journal_id'];
$where['state'] = 0;
$where['j_board.journal_id'] = $journal_info['journal_id'];
$where['j_board.state'] = 0;
if($data['board_group_id']!=-1){
$where['board_group_id'] = $data['board_group_id'];
$where['j_board.board_group_id'] = $data['board_group_id'];
}
$boards = $this->board_obj->where($where)->order(['type asc','name'])->select();
$boards = $this->board_obj
->field("j_board.*,j_board_group.group_name")
->join('j_board_group','j_board.board_group_id=j_board_group.board_group_id','left')
->where($where)
->order(['j_board.type asc','j_board.name'])
->select();
$re['boards'] = $boards;
return jsonSuccess($re);
}
@@ -198,9 +203,9 @@ class Board extends Controller {
mkdir(ROOT_PATH.'public'.DS.'boardIcon'.DS.date('Ymd'));
}
$file_name = substr($data['board_icon'],strripos($data['board_icon'],'/')+1);
$co = @copy("http://api.tmrjournals.com/public/".$data['board_icon'],ROOT_PATH.'public'.DS.'boardIcon'.DS.date('Ymd').DS.$file_name);
$co = @copy("http://api.tmrjournals.com/public/boardIcon/".$data['board_icon'],ROOT_PATH.'public'.DS.'boardIcon'.DS.date('Ymd').DS.$file_name);
$insert['journal_id'] = $data['journal_id'];
$insert['journal_id'] = $journal_info['journal_id'];
$insert['type'] = $data['type'];
$insert['email'] =$data['email'];
$insert['name'] = trim($data['name']);
@@ -258,7 +263,7 @@ class Board extends Controller {
return jsonError($rule->getError());
}
$board_info = $this->board_obj
->field("j_board,j_journal.issn")
->field("j_board.*,j_journal.issn")
->join('j_journal','j_journal.journal_id = j_board.journal_id','left')
->where('board_id',$data['board_id'])
->find();