Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* Fix bug #22952,22979.

Browse Source
This commit is contained in:
tianshujie
2022-05-26 11:35:47 +08:00
parent 3e427c11a4
commit 017019f6af
2 changed files with 28 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/task/control.php
+5 -4
View File
@@ -1215,11 +1215,12 @@ class task extends control
{
$teams = array_keys($task->team);
$task->nextBy = $this->task->getNextUser($teams, $task->assignedTo);
$task->myConsumed = $task->team[$task->assignedTo]->consumed;
$task->nextBy = $this->task->getNextUser($teams, $this->app->user->account);
$task->myConsumed = $task->team[$this->app->user->account]->consumed;
$lastAccount = end($teams);
if($lastAccount != $task->assignedTo)
$lastAccount = end($teams);
$finishedUsers = $this->task->getFinishedUsers($taskID, $teams);
if(($lastAccount != $task->assignedTo and $task->mode == 'linear') or ($task->mode == 'multi' and count($teams) != count($finishedUsers)))
{
$members = $this->task->getMemberPairs($task);
}