* fix bug #32109.

2023-02-17 15:17:06 +08:00
parent 60df9f7ee6
commit 9f0f6014d8
1 changed files with 6 additions and 0 deletions
@@ -2243,10 +2243,16 @@ class executionModel extends model
            ->orderBy('id_asc')
            ->fetchGroup('execution', 'id');

+        $taskIdList = array();
+        foreach($executionTasks as $executionID => $tasks) $taskIdList = array_merge($taskIdList, array_keys($tasks));
+        $taskIdList = array_unique($taskIdList);
+        $teamGroups = $this->dao->select('id,task,account,status')->from(TABLE_TASKTEAM)->where('task')->in($taskIdList)->fetchGroup('task', 'id');
+
        foreach($executionTasks as $executionID => $tasks)
        {
            foreach($tasks as $task)
            {
+                if(isset($teamGroups[$task->id])) $task->team = $teamGroups[$task->id];
                if($task->parent > 0 and isset($executionTasks[$executionID][$task->parent]))
                {
                    $executionTasks[$executionID][$task->parent]->children[$task->id] = $task;