* adjust for linear task.

2022-08-17 13:07:33 +08:00
parent 95ef309921
commit aa4fd1de10
12 changed files with 132 additions and 148 deletions
@@ -358,10 +358,9 @@ class reportModel extends model
            $taskGroups[$task->assignedTo][$task->id] = $task;
        }

-        $multiTaskTeams = $this->dao->select('*')->from(TABLE_TEAM)->where('type')->eq('task')
-            ->andWhere('root')->in(array_keys($allTasks))
+        $multiTaskTeams = $this->dao->select('*')->from(TABLE_TASKTEAM)->where('task')->in(array_keys($allTasks))
            ->beginIF($dept)->andWhere('account')->in(array_keys($deptUsers))->fi()
-            ->fetchGroup('account', 'root');
+            ->fetchGroup('account', 'task');
        foreach($multiTaskTeams as $assignedTo => $multiTasks)
        {
            foreach($multiTasks as $task)