From 4caa233f2cd65104dc75402d9658f363bc1a38ac Mon Sep 17 00:00:00 2001
From: holan20180123 <56391770@qq.com>
Date: Wed, 2 Dec 2020 09:31:09 +0800
Subject: [PATCH] * Fix bug 3709.

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

diff --git a/module/project/model.php b/module/project/model.php
index cdea9ce3da..3a995bc0c1 100644
--- a/module/project/model.php
+++ b/module/project/model.php
@@ -1195,10 +1195,17 @@ class projectModel extends model
         $project = $this->loadModel('program')->getPRJById($this->session->PRJ);
         if($project and $project->model == 'waterfall')
         {
-            foreach($parents as $id => $execution) $execution->children = isset($children[$id]) ? $children[$id] : array();
+            foreach($parents as $id => $execution)
+            {
+                $execution->children = isset($children[$id]) ? $children[$id] : array();
+                unset($children[$id]);
+            }
         }
 
-        return $parents;
+        $aloneChildren = array();
+        foreach($children as $child) $aloneChildren = array_merge($child, $aloneChildren);
+
+        return array_merge($parents, $aloneChildren);
     }
 
     /**