From 8499ea4819c05ebddbe5153e948f0d4e8267e4ed Mon Sep 17 00:00:00 2001
From: chenfeiCF <chenfei@qdphp.com>
Date: Tue, 23 Feb 2016 20:56:35 +0800
Subject: [PATCH] * finish task #2015.

---
 module/testtask/control.php | 2 +-
 module/user/model.php       | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/module/testtask/control.php b/module/testtask/control.php
index bcada379d9..d8306e7114 100644
--- a/module/testtask/control.php
+++ b/module/testtask/control.php
@@ -314,7 +314,7 @@ class testtask extends control
         $this->view->productID   = $productID;
         $this->view->productName = $this->products[$productID];
         $this->view->task        = $task;
-        $this->view->users       = $this->loadModel('user')->getPairs('noclosed,nodeleted,qafirst');
+        $this->view->users       = $this->loadModel('user')->getPairs('noclosed,qafirst');
         $this->view->moduleTree  = $this->loadModel('tree')->getTreeMenu($productID, $viewType = 'case', $startModuleID = 0, array('treeModel', 'createTestTaskLink'), $extra = $taskID);
         $this->view->browseType  = $browseType;
         $this->view->param       = $param;
diff --git a/module/user/model.php b/module/user/model.php
index 5b5f530ec6..f52d403a51 100644
--- a/module/user/model.php
+++ b/module/user/model.php
@@ -71,7 +71,7 @@ class userModel extends model
          * If there's xxfirst in the params, use INSTR function to get the position of role fields in a order string,
          * thus to make sure users of this role at first.
          */
-        $fields = 'account, realname';
+        $fields = 'account, realname, deleted';
         if(strpos($params, 'pofirst') !== false) $fields .= ", INSTR(',pd,po,', role) AS roleOrder";
         if(strpos($params, 'pdfirst') !== false) $fields .= ", INSTR(',po,pd,', role) AS roleOrder";
         if(strpos($params, 'qafirst') !== false) $fields .= ", INSTR(',qd,qa,', role) AS roleOrder";
@@ -92,7 +92,7 @@ class userModel extends model
         {
             $firstLetter = ucfirst(substr($account, 0, 1)) . ':';
             if(strpos($params, 'noletter') !== false) $firstLetter =  '';
-            $users[$account] =  $firstLetter . ($user->realname ? $user->realname : $account);
+            $users[$account] =  $firstLetter . (($user->deleted == 1) ? $account : ($user->realname ? $user->realname : $account));
         }
 
         /* Append empty, closed, and guest users. */