Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* Adjust code

Browse Source
This commit is contained in:
zenggang
2022-07-26 08:03:25 +00:00
parent 85bee8b23d
commit bdc6e88244
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/todo/model.php
+10 -6
View File
@@ -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')