Merge branch 'master_xieqiyu_76331' into 'master'

* Fix bug#29730. See merge request easycorp/zentaopms!6170
2022-11-16 01:59:20 +00:00
parent fc592d33d2 ad6a5c5524
commit ecb1815b3d
1 changed files with 7 additions and 0 deletions
@@ -36,6 +36,13 @@ class projectStory extends control
     */
    public function story($projectID = 0, $productID = 0, $branch = 0, $browseType = '', $param = 0, $storyType = 'story', $orderBy = '', $recTotal = 0, $recPerPage = 20, $pageID = 1)
    {
+        /* Get productID for none-product project. */
+        if($projectID)
+        {
+            $project = $this->loadModel('project')->getByID($projectID);
+            if(!$project->hasProduct) $productID = $this->dao->select('product')->from(TABLE_PROJECTPRODUCT)->where('project')->eq($projectID)->fetch('product');
+        }
+
        $this->products = $this->loadModel('product')->getProductPairsByProject($projectID);

        /* Set product list for export. */