* Refactor getMultiTaskMembers method.

This commit is contained in:
tianshujie
2023-08-22 16:56:16 +08:00
parent c570c0c209
commit bcebfe4327
3 changed files with 7 additions and 5 deletions
+1 -1
View File
@@ -203,7 +203,7 @@ class messageModel extends model
}
if(empty($toList) and $objectType == 'task' and $object->mode == 'multi')
{
$teamMembers = $this->loadModel('task')->getTeamMembers($object->id);
$teamMembers = $this->loadModel('task')->getMultiTaskMembers($object->id);
$toList = array_filter($teamMembers, function($account){
return $account != $this->app->user->account;
});
+5 -3
View File
@@ -2540,7 +2540,7 @@ class taskModel extends model
$mailto = is_null($task->mailto) ? array() : explode(',', trim($task->mailto, ','));
if($task->mode == 'multi')
{
$teamList = $this->getTeamMembers($task->id);
$teamList = $this->getMultiTaskMembers($task->id);
$teamList = implode(',', $teamList);
$assignedTo = $teamList;
}
@@ -2707,16 +2707,18 @@ class taskModel extends model
}
/**
* Get teamTask members.
* 获取并行任务的团队成员。
* Get parallel task's members.
*
* @param int $taskID
* @access public
* @return array
*/
public function getTeamMembers($taskID)
public function getMultiTaskMembers(int $taskID): array
{
$taskType = $this->dao->select('mode')->from(TABLE_TASK)->where('id')->eq($taskID)->fetch('mode');
if($taskType != 'multi') return array();
$teamMembers = $this->dao->select('account')->from(TABLE_TASKTEAM)->where('task')->eq($taskID)->fetchPairs();
return empty($teamMembers) ? $teamMembers : array_keys($teamMembers);
}
+1 -1
View File
@@ -362,7 +362,7 @@ class taskTest
$task->lastEditedBy = $this->objectModel->app->user->account;
$object = $this->objectModel->updateTeam($task, $team, $teamSource, $teamEstimate, $teamConsumed, $teamLeft);
if($getTeam) return $this->objectModel->getTeamMembers($taskID);
if($getTeam) return $this->objectModel->getMultiTaskMembers($taskID);
if(dao::isError())
{
$errors = dao::getError();