From a6804ba463e8f9f69abc974673b615ac6111c4b2 Mon Sep 17 00:00:00 2001
From: wangjinlei <751475802@qq.com>
Date: Mon, 28 Oct 2024 14:39:11 +0800
Subject: [PATCH] 1

---
 application/master/controller/Journal.php   | 25 +++++++++++++++++++++
 application/master/controller/Submision.php |  2 +-
 2 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/application/master/controller/Journal.php b/application/master/controller/Journal.php
index 006bf0b..1d29b31 100644
--- a/application/master/controller/Journal.php
+++ b/application/master/controller/Journal.php
@@ -1091,6 +1091,22 @@ class Journal extends Controller
         return jsonSuccess([]);
     }
 
+
+    public function editJournalEmailPasswordForSubmission(){
+        $data = $this->request->post();
+        $rule = new Validate([
+            "issn"=>"require",
+            "epassword"=>"require"
+        ]);
+        if(!$rule->check($data)){
+            return jsonError($rule->getError());
+        }
+        $this->journal_obj->where("issn",$data['issn'])->update(['epassword'=>$data['epassword']]);
+        return jsonSuccess([]);
+    }
+
+
+
     /**
      * 发送推广邮件到订阅者
      */
@@ -1899,6 +1915,9 @@ class Journal extends Controller
 
     }
 
+
+
+
     /**
      * @title 获取期刊分期
      * @description 获取期刊分期
@@ -1966,6 +1985,12 @@ class Journal extends Controller
     public function delStage()
     {
         $data = $this->request->post();
+
+        $check = $this->article_obj->where("journal_stage_id",$data['journal_stage_id'])->where("state",0)->find();
+        if($check){
+            return jsonError("已存在文章，删除失败");
+        }
+
         $res = $this->journal_stage_obj->where('journal_stage_id', $data['journal_stage_id'])->update(['state' => 1]);
         if ($res) {
             return json(['code' => 0, 'msg' => 'success']);
diff --git a/application/master/controller/Submision.php b/application/master/controller/Submision.php
index 41207e0..c186150 100644
--- a/application/master/controller/Submision.php
+++ b/application/master/controller/Submision.php
@@ -70,7 +70,7 @@ class Submision extends Controller {
             return jsonError($rule->getError());
         }
         $journal_info = $this->journal_obj->where('issn',$data['issn'])->find();
-        $list = $this->journal_stage_obj->where('journal_id',$journal_info['journal_id'])->where('state',0)->select();
+        $list = $this->journal_stage_obj->where('journal_id',$journal_info['journal_id'])->where('state',0)->order("stage_year,stage_no")->select();
         $re['stages'] = $list;
         return jsonSuccess($re);
     }