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

Merge branch 'zentaopms_9.8' of github.com:easysoft/zentaopms into zentaopms_9.8

Browse Source
This commit is contained in:
wumo
2018-03-30 14:38:39 +08:00
parent 69255bb181 d862e2698d
commit 0930835923
9 changed files with 72 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/task/model.php
+2 -2
View File
@@ -973,15 +973,15 @@ class taskModel extends model
if($left != 0 || $task->assignedTo != $teams[count($teams) - 1])
{
$newTask->status = 'doing';
if($task->assignedTo != $teams[count($teams) - 1] && $left == 0)
if($left == 0)
{
$newTask->assignedTo = $this->getNextUser($teams, $task->assignedTo);
$newTask->assignedDate = $now;
}
$task->status = $oldStatus;
$this->dao->update(TABLE_TASK)->data($newTask)->where('id')->eq((int)$taskID)->exec();
$task->status = $oldStatus;
$changes = common::createChanges($task, $newTask);
if(!empty($actionID)) $this->action->logHistory($actionID, $changes);
return $changes;