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

Merge branch '230' into sprint/zentaopms230

Browse Source
This commit is contained in:
sunguangming
2022-08-25 09:59:07 +08:00
parent 1ac7743874 01172dd284
commit f49d83f024
7 changed files with 57 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/task/control.php
+13 -1
View File
@@ -1340,7 +1340,19 @@ class task extends control
$currentTeam = $this->task->getTeamByAccount($task->team);
if($currentTeam) $task->myConsumed = $currentTeam->consumed;
$members = $this->task->getMemberPairs($task);
$task->nextBy = $this->task->getAssignedTo4Multi($members, $task);
$task->myConsumed = isset($task->team[$this->app->user->account]) ? $task->team[$this->app->user->account]->consumed : 0;
$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);
}
else
{
$task->nextBy = $task->openedBy;
}
}
$this->view->title = $this->view->execution->name . $this->lang->colon .$this->lang->task->finish;