From e5c7399e14ce28f56bc3207839689c96b0c8f4d2 Mon Sep 17 00:00:00 2001
From: wangjinlei <751475802@qq.com>
Date: Wed, 2 Dec 2020 10:29:43 +0800
Subject: [PATCH] 20201112

---
 application/master/controller/Journal.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/application/master/controller/Journal.php b/application/master/controller/Journal.php
index 876e1dd..487844f 100644
--- a/application/master/controller/Journal.php
+++ b/application/master/controller/Journal.php
@@ -227,6 +227,7 @@ class Journal extends Controller  {
      * @param name:parent_id type:int require:1 default:0 desc:父id
      * @param name:title type:string require:1 desc:标题
      * @param name:icon type:string require:1 desc:缩略图
+     * @param name:position type:string require:1 desc:摆放位置
      * @param name:is_final type:int require:1 desc:是否终结点（0no1yes）
      * @param name:sort type:int require:1 default:0 desc:权重
      */
@@ -243,6 +244,9 @@ class Journal extends Controller  {
         $insert['parent_id'] = $data['parent_id'];
         $insert['title'] = $data['title'];
         $insert['icon'] = $data['icon'];
+        if($data['parent_id']==0){
+            $insert['position'] = $data['position'];
+        }
         $insert['is_final'] = $data['is_final'];
         $insert['sort'] = $data['sort'];
         $insert['level'] = $level;
@@ -264,6 +268,7 @@ class Journal extends Controller  {
      * @param name:journal_topic_id type:int require:1 desc:主键
      * @param name:title type:string require:1 desc:标题
      * @param name:icon type:string require:1 desc:缩略图
+     * @param name:position type:string require:1 desc:摆放位置
      * @param name:is_final type:int require:1 desc:是否终结点（0no1yes）
      * @param name:sort type:int require:1 default:0 desc:权重
      */
@@ -272,6 +277,7 @@ class Journal extends Controller  {
         $update['journal_topic_id'] = $data['journal_topic_id'];
         $update['title'] = $data['title'];
         $update['icon'] = $data['icon'];
+        $update['position'] = isset($data['position'])?$data['position']:'';
         $update['is_final'] = $data['is_final'];
         $update['sort'] = $data['sort'];
         $res = $this->journal_topic_obj->update($update);