From 82142502e60d0f172cbf9259c7812db3dd8900bc Mon Sep 17 00:00:00 2001
From: tianshujie98 <tianshujie0123@163.com>
Date: Tue, 30 Mar 2021 15:35:24 +0800
Subject: [PATCH] * Fix a bug.

---
 module/user/control.php | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/module/user/control.php b/module/user/control.php
index e6b3bf0380..8085bb333f 100644
--- a/module/user/control.php
+++ b/module/user/control.php
@@ -80,7 +80,7 @@ class user extends control
         $users   = $this->loadModel('user')->getPairs('useid|noletter|noclosed');
 
         /* set menus. */
-        $this->view->userList = $this->user->setUserList($users, $userID);
+        $this->view->userList = $this->user->setUserList($this->user->getPairs('noempty|noclosed|nodeleted|useid|noletter'), $userID);
 
         $this->view->title      = $this->lang->user->common . $this->lang->colon . $this->lang->user->todo;
         $this->view->position[] = $this->lang->user->todo;
@@ -135,7 +135,7 @@ class user extends control
         $this->view->type       = $type;
         $this->view->user       = $user;
         $this->view->pager      = $pager;
-        $this->view->userList   = $this->user->setUserList($users, $userID);
+        $this->view->userList   = $this->user->setUserList($this->user->getPairs('noempty|noclosed|nodeleted|useid|noletter'), $userID);
 
         $this->display();
     }
@@ -165,7 +165,7 @@ class user extends control
         $users   = $this->loadModel('dept')->getDeptUserPairs($user->dept, 'useid');
 
         /* Set the menu. */
-        $this->view->userList = $this->user->setUserList($users, $userID);
+        $this->view->userList = $this->user->setUserList($this->user->getPairs('noempty|noclosed|nodeleted|useid|noletter'), $userID);
 
         /* Assign. */
         $this->view->title      = $this->lang->user->common . $this->lang->colon . $this->lang->user->task;
@@ -206,7 +206,7 @@ class user extends control
         $users   = $this->loadModel('dept')->getDeptUserPairs($user->dept, 'useid');
 
         /* Set menu. */
-        $this->view->userList = $this->user->setUserList($users, $userID);
+        $this->view->userList = $this->user->setUserList($this->user->getPairs('noempty|noclosed|nodeleted|useid|noletter'), $userID);
 
         /* Load the lang of bug module. */
         $this->app->loadLang('bug');
@@ -246,7 +246,7 @@ class user extends control
         $users   = $this->loadModel('dept')->getDeptUserPairs($user->dept, 'useid');
 
         /* Set menu. */
-        $this->view->userList = $this->user->setUserList($users, $userID);
+        $this->view->userList = $this->user->setUserList($this->user->getPairs('noempty|noclosed|nodeleted|useid|noletter'), $userID);
 
         /* Save session. */
         $this->session->set('testtaskList', $this->app->getURI(true), 'qa');
@@ -323,7 +323,7 @@ class user extends control
         $this->view->pageID     = $pageID;
         $this->view->orderBy    = $orderBy;
         $this->view->pager      = $pager;
-        $this->view->userList   = $this->user->setUserList($users, $userID);
+        $this->view->userList   = $this->user->setUserList($this->user->getPairs('noempty|noclosed|nodeleted|useid|noletter'), $userID);
 
         $this->display();
     }
@@ -353,7 +353,7 @@ class user extends control
 
         /* Set the menus. */
         $this->loadModel('project');
-        $this->view->userList = $this->user->setUserList($users, $userID);
+        $this->view->userList = $this->user->setUserList($this->user->getPairs('noempty|noclosed|nodeleted|useid|noletter'), $userID);
 
         $this->view->title      = $this->lang->user->common . $this->lang->colon . $this->lang->user->execution;
         $this->view->position[] = $this->lang->user->execution;
@@ -392,7 +392,7 @@ class user extends control
         $pager = pager::init($recTotal, $recPerPage, $pageID);
 
         /* Set the menus. */
-        $this->view->userList = $this->user->setUserList($users, $userID);
+        $this->view->userList = $this->user->setUserList($this->user->getPairs('noempty|noclosed|nodeleted|useid|noletter'), $userID);
 
         $this->view->title      = $this->lang->user->common . $this->lang->colon . $this->lang->user->issue;
         $this->view->position[] = $this->lang->user->issue;
@@ -432,7 +432,7 @@ class user extends control
         $pager = pager::init($recTotal, $recPerPage, $pageID);
 
         /* Set the menus. */
-        $this->view->userList = $this->user->setUserList($users, $userID);
+        $this->view->userList = $this->user->setUserList($this->user->getPairs('noempty|noclosed|nodeleted|useid|noletter'), $userID);
 
         $this->view->title      = $this->lang->user->common . $this->lang->colon . $this->lang->user->risk;
         $this->view->position[] = $this->lang->user->risk;
@@ -467,7 +467,7 @@ class user extends control
         $this->view->groups       = $this->loadModel('group')->getByAccount($account);
         $this->view->deptPath     = $this->dept->getParents($user->dept);
         $this->view->personalData = $this->user->getPersonalData($user->account);
-        $this->view->userList     = $this->user->setUserList($users, $userID);
+        $this->view->userList     = $this->user->setUserList($this->user->getPairs('noempty|noclosed|nodeleted|useid|noletter'), $userID);
 
         $this->display();
     }
@@ -1058,7 +1058,7 @@ class user extends control
         $users   = $this->loadModel('dept')->getDeptUserPairs($user->dept, 'useid');
 
         /* set menus. */
-        $this->view->userList = $this->user->setUserList($users, $userID);
+        $this->view->userList = $this->user->setUserList($this->user->getPairs('noempty|noclosed|nodeleted|useid|noletter'), $userID);
 
         /* Save session. */
         $uri = $this->app->getURI(true);