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

* Fix bug #21804.

Browse Source
This commit is contained in:
孙广明
2022-04-21 16:34:31 +08:00
parent 57a39efdea
commit 59f717ddb9
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/story/model.php
+12 -3
View File
@@ -4275,7 +4275,10 @@ class storyModel extends model
$stories[$id]->tasks = $this->loadModel('task')->getStoryTasks($id);
if($this->config->edition == 'max')
{
$stories[$id]->designs = $this->dao->select('id, name')->from(TABLE_DESIGN)->where('story')->eq($id)->fetchAll('id');
$stories[$id]->designs = $this->dao->select('id, name')->from(TABLE_DESIGN)
->where('story')->eq($id)
->andWhere('deleted')->eq('0')
->fetchAll('id');
$stories[$id]->revisions = $this->dao->select('BID, extra')->from(TABLE_RELATION)
->where('AType')->eq('design')
->andWhere('BType')->eq('commit')
@@ -4345,7 +4348,10 @@ class storyModel extends model
$stories[$id]->tasks = $this->loadModel('task')->getStoryTasks($id);
if($this->config->edition == 'max')
{
$stories[$id]->designs = $this->dao->select('id, name')->from(TABLE_DESIGN)->where('story')->eq($id)->fetchAll('id');
$stories[$id]->designs = $this->dao->select('id, name')->from(TABLE_DESIGN)
->where('story')->eq($id)
->andWhere('deleted')->eq('0')
->fetchAll('id');
$stories[$id]->revisions = $this->dao->select('BID, extra')->from(TABLE_RELATION)
->where('AType')->eq('design')
->andWhere('BType')->eq('commit')
@@ -4385,7 +4391,10 @@ class storyModel extends model
$track[$id]->task = $this->loadModel('task')->getStoryTasks($id);
if($this->config->edition == 'max')
{
$track[$id]->design = $this->dao->select('id, name')->from(TABLE_DESIGN)->where('story')->eq($id)->fetchAll('id');
$track[$id]->design = $this->dao->select('id, name')->from(TABLE_DESIGN)
->where('story')->eq($id)
->andWhere('deleted')->eq('0')
->fetchAll('id');
$track[$id]->revision = $this->dao->select('BID, extra')->from(TABLE_RELATION)->where('AType')->eq('design')->andWhere('BType')->eq('commit')->andWhere('AID')->in(array_keys($track[$id]->design))->fetchPairs();
}
}