diff --git a/application/master/controller/Article.php b/application/master/controller/Article.php index e475178..d4f6ee6 100644 --- a/application/master/controller/Article.php +++ b/application/master/controller/Article.php @@ -454,6 +454,8 @@ class Article extends Controller { $insert['abstract'] = $data['abstract']; $insert['pub_date'] = $data['pub_date']; $insert['abbr'] = $data['abbr']; + $insert['tradition_tag'] = isset($data['tradition_tag'])?$data['tradition_tag']:''; + $insert['tradition'] = isset($data['tradition'])?$data['tradition']:''; $insert['keywords'] = $data['keywords']; $insert['npp'] = $data['npp']; $insert['file_pdf'] = date('Ymd').DS.$file_name; @@ -483,6 +485,7 @@ class Article extends Controller { $insert_author['author_country'] = $v['author_country']; $insert_author['is_first'] = $v['is_first']; $insert_author['is_report'] = $v['is_report']; + $insert_author['orcid'] = $v['orcid']; $insert_author['email'] = $v['email']; $ca_au_id = $this->article_author_obj->insertGetId($insert_author); $cache_organs = $v['organs']; diff --git a/application/master/controller/Board.php b/application/master/controller/Board.php index 8dd1555..81cd963 100644 --- a/application/master/controller/Board.php +++ b/application/master/controller/Board.php @@ -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();