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

* Fix bug #23744.

Browse Source
This commit is contained in:
liumengyi
2022-06-15 13:57:12 +08:00
parent 23be41cd71
commit 023eaedf83
1 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/execution/model.php
+17 -13
View File
@@ -2529,9 +2529,9 @@ class executionModel extends model
*/
public function linkStories($executionID)
{
$plans = $this->dao->select('plan,product')->from(TABLE_PROJECTPRODUCT)
$plans = $this->dao->select('product,plan')->from(TABLE_PROJECTPRODUCT)
->where('project')->eq($executionID)
->fetchPairs('plan', 'product');
->fetchPairs('product', 'plan');
$planStories = array();
$planProducts = array();
@@ -2539,23 +2539,27 @@ class executionModel extends model
$this->loadModel('story');
if(!empty($plans))
{
foreach($plans as $planID => $productID)
foreach($plans as $productID => $planIDList)
{
if(empty($planID)) continue;
$planStory = $this->story->getPlanStories($planID);
if(!empty($planStory))
if(empty($planIDList)) continue;
$planIDList = explode(',', $planIDList);
foreach($planIDList as $planID)
{
foreach($planStory as $id => $story)
$planStory = $this->story->getPlanStories($planID);
if(!empty($planStory))
{
if($story->status == 'draft')
foreach($planStory as $id => $story)
{
$count++;
unset($planStory[$id]);
continue;
if($story->status == 'draft')
{
$count++;
unset($planStory[$id]);
continue;
}
$planProducts[$story->id] = $story->product;
}
$planProducts[$story->id] = $story->product;
$planStories = array_merge($planStories, array_keys($planStory));
}
$planStories = array_merge($planStories, array_keys($planStory));
}
}
}