From d741dfd154c3bb2648111d2a7365ee53d7926773 Mon Sep 17 00:00:00 2001 From: zhouxin Date: Tue, 20 Dec 2022 07:29:13 +0000 Subject: [PATCH] * Resolve feedback #172. --- module/report/model.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/module/report/model.php b/module/report/model.php index d25d4b0978..d9e93fd9b7 100644 --- a/module/report/model.php +++ b/module/report/model.php @@ -516,9 +516,12 @@ class reportModel extends model return $this->dao->select('t1.id, t1.name, t2.account as user, t1.deadline')->from(TABLE_TASK)->alias('t1') ->leftJoin(TABLE_USER)->alias('t2')->on('t1.assignedTo = t2.account') ->leftJoin(TABLE_EXECUTION)->alias('t3')->on('t1.execution = t3.id') + ->leftJoin(TABLE_PROJECT)->alias('t4')->on('t1.project = t4.id') ->where('t1.assignedTo')->ne('') ->andWhere('t1.deleted')->eq(0) ->andWhere('t2.deleted')->eq(0) + ->andWhere('t3.deleted')->eq(0) + ->andWhere('t4.deleted')->eq(0) ->andWhere('t1.status')->in('wait,doing') ->andWhere('t3.status')->ne('suspended') ->andWhere('t1.deadline', true)->eq('0000-00-00')