From 2556a44a220623e6faa9809e71df043391d16868 Mon Sep 17 00:00:00 2001 From: tianshujie98 Date: Mon, 28 Sep 2020 11:13:08 +0800 Subject: [PATCH] * Fix bug #3497. --- module/task/model.php | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/module/task/model.php b/module/task/model.php index 602b236ed4..3f9e9ae59a 100644 --- a/module/task/model.php +++ b/module/task/model.php @@ -2449,12 +2449,26 @@ class taskModel extends model */ public function getDataOfTasksPerAssignedTo() { - $tasks = $this->dao->select('id,parent,assignedTo')->from(TABLE_TASK)->alias('t1') + $tasks = $this->dao->select('id,assignedTo')->from(TABLE_TASK)->alias('t1') ->where($this->reportCondition()) ->fetchAll('id'); if(!$tasks) return array(); - $datas = $this->processData4Report($tasks, $tasks, 'assignedTo'); + /* Fix bug #3497. */ + $fields = array(); + $datas = array(); + foreach($tasks as $taskID => $task) + { + if(!isset($fields[$task->assignedTo])) $fields[$task->assignedTo] = 0; + $fields[$task->assignedTo] ++; + } + foreach($fields as $field => $count) + { + $data = new stdclass(); + $data->name = $field; + $data->value = $count; + $datas[$field] = $data; + } if(!isset($this->users)) $this->users = $this->loadModel('user')->getPairs('noletter'); foreach($datas as $account => $data)