Merge branch 'master' into zenops_44

2022-08-30 16:39:58 +08:00
parent 1fc1eb600e 9b456c830c
commit 20d6ee9e10
102 changed files with 2363 additions and 1519 deletions
@@ -1345,7 +1345,6 @@ class task extends control
        $members      = $task->team ? $this->task->getMemberPairs($task) : $this->loadModel('user')->getTeamMemberPairs($task->execution, 'execution', 'nodeleted');
        $task->nextBy = $task->openedBy;

-        $this->view->users = $members;
        if(!empty($task->team))
        {
            $teams = array_keys($task->team);
@@ -1368,6 +1367,7 @@ class task extends control
        $this->view->title      = $this->view->execution->name . $this->lang->colon .$this->lang->task->finish;
        $this->view->position[] = $this->lang->task->finish;
        $this->view->members    = $members;
+        $this->view->users      = $this->loadModel('user')->getPairs('noletter');

        $this->display();
    }