diff --git a/application/master/controller/Journal.php b/application/master/controller/Journal.php
index 737bbc5..dd9c799 100644
--- a/application/master/controller/Journal.php
+++ b/application/master/controller/Journal.php
@@ -36,11 +36,23 @@ class Journal extends Controller  {
      * @url /master/Journal/getJournalList
      * @method POST
      * 
+     * @param name:editor_id type:int require:1 desc:编辑id
+     * 
      * @return journalList:期刊列表@
      * @journalList title:标题 issn:issn editorinchief:editorinchief acceptance:acceptance finaldecision:finaldecision apc:apc
      */
     public function getJournalList(){
-        $res = $this->journal_obj->field('j_journal.*,j_admin.realname realname')->join('j_admin','j_admin.admin_id = j_journal.editor_id','LEFT')->where('j_journal.state',0)->order('j_journal.sort desc')->select();
+        $data = $this->request->post();
+        $where['j_journal.state'] = 0;
+        if($data['editor_id']!=1){
+            $where['j_journal.editor_id'] = $data['editor_id'];
+        }
+        $res = $this->journal_obj
+                ->field('j_journal.*,j_admin.realname realname')
+                ->join('j_admin','j_admin.admin_id = j_journal.editor_id','LEFT')
+                ->where($where)
+                ->order('j_journal.sort desc')
+                ->select();
         return json(['code'=>0,'msg'=>'success','data'=>['journalList'=>$res]]);
     }