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

* Try to fix bug #31742.

Browse Source
This commit is contained in:
songchenxuan
2023-05-26 09:15:10 +08:00
parent 02969e979b
commit 8f153a63b7
1 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/doc/model.php
+3 -9
View File
@@ -1905,12 +1905,8 @@ class docModel extends model
elseif($type == 'project')
{
$project = $this->loadModel('project')->getByID($objectID);
$storyIDList = '';
if(!$project->hasProduct)
{
$projectIDList = $this->dao->select('*')->from(TABLE_PROJECT)->where('id')->eq($objectID)->orWhere('project')->eq($objectID)->fetchPairs('id', 'id');
$storyIDList = $this->dao->select('story')->from(TABLE_PROJECTSTORY)->where('project')->in($projectIDList)->fetchPairs('story', 'story');
}
$projectIDList = $this->dao->select('*')->from(TABLE_PROJECT)->where('id')->eq($objectID)->orWhere('project')->eq($objectID)->fetchPairs('id', 'id');
$storyIDList = $this->dao->select('story')->from(TABLE_PROJECTSTORY)->where('project')->in($projectIDList)->fetchPairs('story', 'story');
if($this->config->edition == 'max')
{
@@ -1933,10 +1929,8 @@ class docModel extends model
elseif($type == 'execution')
{
$execution = $this->loadModel('execution')->getByID($objectID);
$project = $this->loadModel('project')->getByID($execution->project);
$storyIDList = '';
if(!$project->hasProduct) $storyIDList = $this->dao->select('story')->from(TABLE_PROJECTSTORY)->where('project')->eq($objectID)->fetchPairs('story', 'story');
$storyIDList = $this->dao->select('story')->from(TABLE_PROJECTSTORY)->where('project')->eq($objectID)->fetchPairs('story', 'story');
if($storyIDList) $storyIDList = join(',', $storyIDList);
$taskPairs = $this->dao->select('id')->from(TABLE_TASK)->where('execution')->eq($objectID)->andWhere('deleted')->eq('0')->andWhere('execution')->in($userView)->fetchPairs('id');