From bdc6e882447847f423da5257325aa8f298544bc9 Mon Sep 17 00:00:00 2001 From: zenggang Date: Tue, 26 Jul 2022 08:03:25 +0000 Subject: [PATCH] * Adjust code --- module/todo/model.php | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/module/todo/model.php b/module/todo/model.php index 8c29dc00f6..be1a8ffa7e 100644 --- a/module/todo/model.php +++ b/module/todo/model.php @@ -558,12 +558,16 @@ class todoModel extends model ->where('t1.type')->eq('story') ->andWhere('t3.deleted')->eq('1') ->fetchPairs(); - $deletedMeeting = $this->dao->select('t1.id')->from(TABLE_TODO)->alias('t1') - ->leftJoin(TABLE_MEETING)->alias('t2')->on('t1.idvalue=t2.id') - ->leftJoin(TABLE_PROJECT)->alias('t3')->on('t2.project=t3.id') - ->where('t1.type')->eq('meeting') - ->andWhere('t3.deleted')->eq('1') - ->fetchPairs(); + $deletedMeeting = array(); + if($this->config->edition == 'max') + { + $deletedMeeting = $this->dao->select('t1.id')->from(TABLE_TODO)->alias('t1') + ->leftJoin(TABLE_MEETING)->alias('t2')->on('t1.idvalue=t2.id') + ->leftJoin(TABLE_PROJECT)->alias('t3')->on('t2.project=t3.id') + ->where('t1.type')->eq('meeting') + ->andWhere('t3.deleted')->eq('1') + ->fetchPairs(); + } $deletedIds = $deletedTaskIds + $deletedBugs + $deletedStories + $deletedMeeting; $stmt = $this->dao->select('*')->from(TABLE_TODO) ->where('deleted')->eq('0')