From 3ebcfb1ddc330fce55da312814f0b6983d160e34 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E6=80=A1=E6=A0=8B?= <wangyidong@cnezsoft.com>
Date: Thu, 17 Feb 2022 11:06:28 +0800
Subject: [PATCH]  * fix bug #19693.

---
 module/bug/control.php | 8 ++++----
 module/user/model.php  | 1 +
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/module/bug/control.php b/module/bug/control.php
index 421c991ae1..502bedb543 100644
--- a/module/bug/control.php
+++ b/module/bug/control.php
@@ -999,7 +999,7 @@ class bug extends control
         $this->view->branchTagOption  = $branchTagOption;
         $this->view->tasks            = $this->task->getExecutionTaskPairs($bug->execution);
         $this->view->testtasks        = $this->loadModel('testtask')->getPairs($bug->product, $bug->execution, $bug->testtask);
-        $this->view->users            = $this->user->getPairs('noclosed', "$bug->assignedTo,$bug->resolvedBy,$bug->closedBy,$bug->openedBy");
+        $this->view->users            = $this->user->getPairs('', "$bug->assignedTo,$bug->resolvedBy,$bug->closedBy,$bug->openedBy");
         $this->view->openedBuilds     = $openedBuilds;
         $this->view->resolvedBuilds   = array('' => '') + $openedBuilds + $oldResolvedBuild;
         $this->view->actions          = $this->action->getList('bug', $bugID);
@@ -1135,7 +1135,7 @@ class bug extends control
             $appendUsers[$bug->assignedTo] = $bug->assignedTo;
             $appendUsers[$bug->resolvedBy] = $bug->resolvedBy;
         }
-        $users = $this->user->getPairs('devfirst|noclosed', $appendUsers, $this->config->maxCount);
+        $users = $this->user->getPairs('devfirst', $appendUsers, $this->config->maxCount);
         $users = array('' => '', 'ditto' => $this->lang->bug->ditto) + $users;
 
         /* Assign. */
@@ -1709,8 +1709,8 @@ class bug extends control
         $this->view->pager      = $pager;
         $this->view->users      = $this->loadModel('user')->getPairs('noletter');
         $this->view->recTotal   = $recTotal;
-        $this->view->recPerPage = $recPerPage;                                                                                                        
-        $this->view->pageID     = $pageID; 
+        $this->view->recPerPage = $recPerPage;
+        $this->view->pageID     = $pageID;
         $this->display();
     }
 
diff --git a/module/user/model.php b/module/user/model.php
index 208613c975..75a1839fcd 100644
--- a/module/user/model.php
+++ b/module/user/model.php
@@ -1123,6 +1123,7 @@ class userModel extends model
             ->beginIF($type == 'project' and !$this->app->user->admin)->andWhere('t2.id')->in($this->app->user->view->projects)->fi()
             ->andWhere('t1.account')->eq($account)
             ->andWhere('t2.deleted')->eq(0)
+            ->andWhere('t2.vision')->eq($this->config->vision)
             ->orderBy("t2.$orderBy")
             ->page($pager)
             ->fetchAll('root');