* Fix Bug#1373,1374.

2018-01-16 10:28:39 +08:00
parent 691df86cce
commit e55e97d7ff
3 changed files with 18 additions and 18 deletions
@@ -2356,11 +2356,11 @@ class taskModel extends model
     */
    public function getMemberPairs($task)
    {
-        $users   = $this->loadModel('user')->getPairs('noletter');
+        $users   = $this->loadModel('project')->getTeamMemberPairs($task->project, 'nodeleted');
        $members = array('');
        foreach($task->team as $member)
        {
-            $members[$member->account] = $users[$member->account];
+            if(isset($users[$member->account])) $members[$member->account] = $users[$member->account];
        }
        return $members;
    }