From 12cfe294fcde193036046ffc1c0f90e19788c70b 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:34:48 +0800
Subject: [PATCH] * + child task export

---
 module/task/control.php | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/module/task/control.php b/module/task/control.php
index c3865d194d..596ea01d78 100644
--- a/module/task/control.php
+++ b/module/task/control.php
@@ -1170,6 +1170,9 @@ class task extends control
                     ->beginIF($this->post->exportType == 'selected')->andWhere('t1.id')->in($this->cookie->checkedItem)->fi()
                     ->orderBy($orderBy)->fetchAll('id');
 
+                $taskList = array_keys($tasks);
+                if(!empty($taskList)) $children = $this->dao->select('*')->from(TABLE_TASK)->where('parent')->in($taskList)->fetchGroup('parent');
+
                 foreach($tasks as $key => $task)
                 {
                     /* Compute task progess. */
@@ -1189,6 +1192,12 @@ class task extends control
                     $task->progess .= '%';
 
                     $tasks[$key] = $task;
+
+                    if(isset($children[$task->id])) foreach($children[$task->id] as $child)
+                    {
+                        $child->name       = $taskLang->childrenAB . ') ' . $child->name;
+                        $tasks[$child->id] = $child;
+                    }
                 }
             }
             else