Merge branch 'zg_bug_24689' into 'master'

* Fix bug #24689 See merge request easycorp/zentaopms!4323
2022-07-05 02:16:07 +00:00
parent bae83de408 e4af7eab3b
commit 0555f59112
1 changed files with 14 additions and 1 deletions
@@ -412,13 +412,26 @@ class execution extends control
            }
            elseif($groupBy == 'assignedTo' and $filter == 'undone')
            {
+                $multiTaskCount = array();
                foreach($groupTasks as $assignedTo => $tasks)
                {
                    foreach($tasks as $i => $task)
                    {
                        if($task->status != 'wait' and $task->status != 'doing')
                        {
-                            $allCount -= 1;
+                            if($task->mode == 'multi')
+                            {
+                                if(!isset($multiTaskCount[$task->id]))
+                                {
+                                    $multiTaskCount[$task->id] = true;
+                                    $allCount -= 1;
+                                }
+                            }
+                            else
+                            {
+                                $allCount -= 1;
+                            }
+
                            unset($groupTasks[$assignedTo][$i]);
                        }
                    }