Merge branch 'fixbug_sunjun_16397' into 'master'

*Fixbug_sunjun_16397 See merge request easycorp/zentaopms!2791
2022-04-07 06:31:07 +00:00
parent 29941e73f7 6b40ab7df0
commit 5a9dd5095b
1 changed files with 1 additions and 0 deletions
@@ -294,6 +294,7 @@ class reportModel extends model
                ->beginIF($dept)->andWhere('t1.account')->in(array_keys($deptUsers))->fi()
                ->andWhere('t1.type')->eq('execution')
                ->andWhere("t1.account NOT IN(SELECT `assignedTo` FROM " . TABLE_TASK . " WHERE `execution` = t1.`root` AND `status` NOT IN('cancel, closed, done, pause') AND assignedTo != '' GROUP BY assignedTo)")
+                ->andWhere('t2.deleted')->eq('0')
                ->fetchGroup('account', 'name');

            $workload = array();