* fix bug for report getUserTesttasks.

2016-01-11 11:32:51 +08:00
parent a0d475720b
commit ba3ed90986
1 changed files with 4 additions and 4 deletions
--- 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();