From b4ceec58758f59b16c5bcc55fbb6bc166a694e2f Mon Sep 17 00:00:00 2001 From: tianshujie Date: Thu, 6 Jun 2024 13:25:52 +0800 Subject: [PATCH] * [bug#50640,done,0.1h] filter deleted user. --- module/report/model.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/module/report/model.php b/module/report/model.php index 9c609f05d0..1d03403d33 100644 --- a/module/report/model.php +++ b/module/report/model.php @@ -197,12 +197,14 @@ class reportModel extends model ->query(); $todos = array(); + $users = $this->loadModel('user')->getPairs('nodeleted'); while($todo = $stmt->fetch()) { + $user = !empty($todo->assignedTo) ? $todo->assignedTo : $todo->account; + if(!isset($users[$user])) continue; + if($todo->type == 'task') $todo->name = $this->dao->findById($todo->objectID)->from(TABLE_TASK)->fetch('name'); if($todo->type == 'bug') $todo->name = $this->dao->findById($todo->objectID)->from(TABLE_BUG)->fetch('title'); - - $user = !empty($todo->assignedTo) ? $todo->assignedTo : $todo->account; $todos[$user][] = $todo; } return $todos;