Merge branch 'master' of https://github.com/easysoft/zentaopms

2019-08-08 18:37:50 +08:00
parent 5e68baf8c5 bd9e0ce1f6
commit c6fbb324bc
22 changed files with 102 additions and 120 deletions
@@ -2002,6 +2002,13 @@ class projectModel extends model
        {
            foreach($taskTeam as $taskID => $team) $tasks[$taskID]->team = $team;
        }
+
+        $parents = array();
+        foreach($tasks as $task)
+        {
+            if($task->parent > 0) $parents[$task->parent] = $task->parent;
+        }
+        $parents = $this->dao->select('*')->from(TABLE_TASK)->where('id')->in($parents)->fetchAll('id');
        
        foreach($tasks as $task)
        {
@@ -2012,6 +2019,11 @@ class projectModel extends model
                    $tasks[$task->parent]->children[$task->id] = $task;
                    unset($tasks[$task->id]);
                }
+                else
+                {
+                    $parent = $parents[$task->parent];
+                    $task->parentName = $parent->name;
+                }
            }
        }
        return $this->loadModel('task')->processTasks($tasks);