From cb75585308abfe60c8d66c02f52798332d05f962 Mon Sep 17 00:00:00 2001
From: xieqiyu <xieqiyu@easycorp.ltd>
Date: Thu, 29 Dec 2022 10:24:04 +0800
Subject: [PATCH] * Fix bug#30697.

---
 module/programplan/control.php | 2 --
 module/programplan/model.php   | 4 ++--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/module/programplan/control.php b/module/programplan/control.php
index 02e635ca3b..9fcd1a3916 100644
--- a/module/programplan/control.php
+++ b/module/programplan/control.php
@@ -61,8 +61,6 @@ class programplan extends control
         $this->commonAction($projectID, $productID, $type);
         $this->session->set('projectPlanList', $this->app->getURI(true), 'project');
 
-        if(empty($productID)) $productID = $this->productID;
-
         if(!defined('RUN_MODE') || RUN_MODE != 'api') $projectID = $this->project->saveState((int)$projectID, $this->project->getPairsByProgram());
 
         $products = $this->loadModel('product')->getProducts($projectID);
diff --git a/module/programplan/model.php b/module/programplan/model.php
index 2428208663..6da24956f2 100755
--- a/module/programplan/model.php
+++ b/module/programplan/model.php
@@ -52,12 +52,12 @@ class programplanModel extends model
      */
     public function getStage($executionID = 0, $productID = 0, $browseType = 'all', $orderBy = 'id_asc')
     {
-        if(empty($executionID) || empty($productID)) return array();
+        if(empty($executionID)) return array();
 
         $plans = $this->dao->select('t2.*')->from(TABLE_PROJECTPRODUCT)->alias('t1')
             ->leftJoin(TABLE_PROJECT)->alias('t2')->on('t1.project = t2.id')
             ->where('t2.type')->eq('stage')
-            ->andWhere('t1.product')->eq($productID)
+            ->beginIF($productID)->andWhere('t1.product')->eq($productID)->fi()
             ->beginIF($browseType == 'all')->andWhere('t2.project')->eq($executionID)->fi()
             ->beginIF($browseType == 'parent')->andWhere('t2.parent')->eq($executionID)->fi()
             ->beginIF(!$this->app->user->admin)->andWhere('t2.id')->in($this->app->user->view->sprints)->fi()