diff --git a/module/task/control.php b/module/task/control.php index 552ef7b8c3..52c9914dff 100755 --- a/module/task/control.php +++ b/module/task/control.php @@ -881,6 +881,7 @@ class task extends control foreach($taskList as $taskID => $task) { if($task->status == 'closed') continue; + if($task->parent > 0 && isset($taskList[$task->parent])) continue; // 同时选中父子,关闭父的时候就关闭子了,不用重复关闭子 $taskData = $this->taskZen->buildTaskForClose($task); $this->task->close($task, $taskData); diff --git a/module/task/model.php b/module/task/model.php index 47c6430a12..de921f47fc 100755 --- a/module/task/model.php +++ b/module/task/model.php @@ -2312,7 +2312,7 @@ class taskModel extends model if($appendParent) { - $parentTasks = $this->dao->select('id,assignedTo,finishedBy,mailto')->from(TABLE_TASK)->where('id')->in($task->path)->andWhere('id')->ne($task->id)->fetchAll('id'); + $parentTasks = $this->dao->select('id,assignedTo,openedBy,finishedBy,mailto')->from(TABLE_TASK)->where('id')->in($task->path)->andWhere('id')->ne($task->id)->fetchAll('id'); foreach($parentTasks as $parentTask) { $parentAssignedTo = $parentTask->assignedTo;