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

* Refactor code.

Browse Source
This commit is contained in:
chaideqing
2022-12-01 13:35:05 +08:00
parent 9fcb9099a7
commit 3c3ce67354
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/message/model.php
+2 -2
View File
@@ -202,8 +202,8 @@ class messageModel extends model
}
if(empty($toList) and $objectType == 'task' and $object->mode == 'multi')
{
$assignedTo = $this->loadModel('task')->getTeamTaskAssignedTo($object->id);
$toList = array_filter($assignedTo, function($account){
$teamMembers = $this->loadModel('task')->getTeamMembers($object->id);
$toList = array_filter($teamMembers, function($account){
return $account != $this->app->user->account;
});
$toList = implode(',', $toList);
module/task/model.php
+5 -5
View File
@@ -3926,7 +3926,7 @@ class taskModel extends model
$toTeamTaskList = '';
if($task->mode == 'multi')
{
$toTeamTaskList = $this->getTeamTaskAssignedTo($task->id);
$toTeamTaskList = $this->getTeamMembers($task->id);
$toTeamTaskList = implode(',', $toTeamTaskList);
$toList = $toTeamTaskList;
}
@@ -4348,17 +4348,17 @@ class taskModel extends model
}
/**
* Get teamTask assignedTo.
* Get teamTask members.
*
* @param int $taskID
* @access public
* @return array
*/
public function getTeamTaskAssignedTo($taskID)
public function getTeamMembers($taskID)
{
$taskType = $this->dao->select('mode')->from(TABLE_TASK)->where('id')->eq($taskID)->fetch('mode');
if($taskType != 'multi') return array();
$assignedToList = $this->dao->select('account')->from(TABLE_TASKTEAM)->where('task')->eq($taskID)->fetchPairs();
return empty($assignedToList) ? array() : array_keys($assignedToList);
$teamMembers = $this->dao->select('account')->from(TABLE_TASKTEAM)->where('task')->eq($taskID)->fetchPairs();
return empty($teamMembers) ? $teamMembers : array_keys($teamMembers);
}
}