From d3607062b3f66288a819659adfb54006da594a7c Mon Sep 17 00:00:00 2001 From: wangyidong Date: Mon, 24 Apr 2017 09:34:53 +0800 Subject: [PATCH] =?UTF-8?q?Fix=20bug#1043=20=E6=AF=8F=E6=97=A5=E6=8F=90?= =?UTF-8?q?=E9=86=92=E5=8A=9F=E8=83=BD=E4=BC=9A=E6=8F=90=E7=A4=BA=E6=9A=82?= =?UTF-8?q?=E5=81=9C=E9=A1=B9=E7=9B=AE=E4=B8=AD=E7=9A=84=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 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 c876eef398..72620b7c44 100644 --- a/module/report/model.php +++ b/module/report/model.php @@ -369,14 +369,14 @@ class reportModel extends model */ public function getUserTasks() { - $tasks = $this->dao->select('t1.id, t1.name, t2.account as user') - ->from(TABLE_TASK)->alias('t1') - ->leftJoin(TABLE_USER)->alias('t2') - ->on('t1.assignedTo = t2.account') + $tasks = $this->dao->select('t1.id, t1.name, t2.account as user')->from(TABLE_TASK)->alias('t1') + ->leftJoin(TABLE_USER)->alias('t2')->on('t1.assignedTo = t2.account') + ->leftJoin(TABLE_PROJECT)->alias('t3')->on('t1.project = t3.id') ->where('t1.assignedTo')->ne('') ->andWhere('t1.deleted')->eq(0) ->andWhere('t2.deleted')->eq(0) ->andWhere('t1.status')->in('wait, doing') + ->andWhere('t3.status')->ne('suspended') ->fetchGroup('user'); return $tasks;