From 0cd0caa4511b94014507e3dcaed8eebc677f50d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=BB=94=E5=93=A5?= <memory@lvtao.net>
Date: Wed, 25 Oct 2017 09:36:01 +0800
Subject: [PATCH] * fix bug

---
 module/project/model.php | 27 +++++++++++++++++++++++++--
 1 file changed, 25 insertions(+), 2 deletions(-)

diff --git a/module/project/model.php b/module/project/model.php
index fe0ffdee9b..a5ff1bcb47 100644
--- a/module/project/model.php
+++ b/module/project/model.php
@@ -2215,10 +2215,24 @@ class projectModel extends model
             $tasks = $this->dao->select('*')->from(TABLE_TASK)
                 ->where('project')->eq((int)$projectID)
                 ->andWhere('deleted')->eq(0)
+                ->andWhere('parent')->eq(0)
                 ->orderBy('id_desc')
                 ->fetchAll();
+            $childTasks = $this->dao->select('*')->from(TABLE_TASK)
+                ->where('project')->eq((int)$projectID)
+                ->andWhere('deleted')->eq(0)
+                ->andWhere('parent')->ne(0)
+                ->orderBy('id_desc')
+                ->fetchGroup('parent');
             $taskGroups = array();
-            foreach($tasks as $task) $taskGroups[$task->module][$task->story][$task->id] = $task;
+            foreach($tasks as $task)
+            {
+                $taskGroups[$task->module][$task->story][$task->id] = $task;
+                if(!empty($childTasks[$task->id]))
+                {
+                    $taskGroups[$task->module][$task->story][$task->id]->children =  $childTasks[$task->id];
+                }
+            }
         }
 
         if(!empty($node->children))
@@ -2284,7 +2298,16 @@ class projectModel extends model
                 {
                     $taskItems = $this->formatTasksForTree($tasks);
                     $node->tasksCount += count($taskItems);
-                    foreach($taskItems as $taskItem) $node->children[$taskItem->id] = $taskItem;
+                    foreach($taskItems as $taskItem)
+                    {
+                        $node->children[$taskItem->id] = $taskItem;
+                        if(!empty($tasks[$taskItem->id]->children))
+                        {
+                            $task = $this->formatTasksForTree($tasks[$taskItem->id]->children);
+                            $node->children[$taskItem->id]->children=$task;
+                            $node->tasksCount += count($task);
+                        }
+                    }
                 }
                 $node->children = array_values($node->children);
             }