From 5d7868be682e9e05946e4681979f18af2d797eae Mon Sep 17 00:00:00 2001
From: wangjinlei <751475802@qq.com>
Date: Sat, 14 Nov 2020 11:26:01 +0800
Subject: [PATCH] 20201112

---
 application/master/controller/Journal.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/application/master/controller/Journal.php b/application/master/controller/Journal.php
index caca258..bfd5f14 100644
--- a/application/master/controller/Journal.php
+++ b/application/master/controller/Journal.php
@@ -259,8 +259,8 @@ class Journal extends Controller  {
      * @return parentList:array#
      */
     public function getParent(){
-//        $data = $this->request->post();
-        $data['journal_id'] = 9;
+        $data = $this->request->post();
+//        $data['journal_id'] = 9;
         $res = $this->journal_topic_obj
                 ->where('journal_id',$data['journal_id'])
                 ->where('state',0)
@@ -319,7 +319,9 @@ class Journal extends Controller  {
             return $vv;
         }
         foreach ($res as $v){
-            $vv['child'][] = $this->getChieldarr($v, $res);
+            if($v['parent_id'] == $vv['journal_topic_id']){
+                $vv['child'][] = $this->getChieldarr($v, $res);
+            }
         }
         return $vv;
     }