From 9f0f6014d8723da02e27d2326abe798a6031461e Mon Sep 17 00:00:00 2001 From: wangyidong Date: Fri, 17 Feb 2023 15:17:06 +0800 Subject: [PATCH] * fix bug #32109. --- module/execution/model.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/module/execution/model.php b/module/execution/model.php index d3a544a17f..8d0242bd36 100755 --- a/module/execution/model.php +++ b/module/execution/model.php @@ -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;