From ba3ed9098663fedea3ad3f507d1db36f5c14685e Mon Sep 17 00:00:00 2001
From: wangyidong <yidong@cnezsoft.com>
Date: Mon, 11 Jan 2016 11:32:51 +0800
Subject: [PATCH]  * fix bug for report getUserTesttasks.

---
 module/report/model.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/module/report/model.php b/module/report/model.php
index 70e196e1c1..8a7975ca6c 100644
--- a/module/report/model.php
+++ b/module/report/model.php
@@ -385,10 +385,10 @@ class reportModel extends model
     public function getUserTesttasks()
     {
         $stmt = $this->dao->select('t1.*, t2.account as user')->from(TABLE_TESTTASK)->alias('t1')
-            ->leftJoin(TABLE_USER)->alias('t2')
-            ->on('t1.owner = t2.account')
-            ->where('t1.status')->eq('wait')
-            ->orWhere('t1.status')->eq('doing')
+            ->leftJoin(TABLE_USER)->alias('t2')->on('t1.owner = t2.account')
+            ->where('t1.deleted')->eq('0')
+            ->andWhere('t2.deleted')->eq('0')
+            ->andWhere("(t1.status='wait' OR t1.status='doing')")
             ->query();
 
         $testtasks = array();