From ef6ffd019b3794da488470fd9aba87d1fe1e8ed5 Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Thu, 7 Jul 2022 15:46:36 +0800
Subject: [PATCH] * Fix bug of task #59480, #59481.

---
 module/execution/control.php | 2 +-
 module/project/control.php   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/module/execution/control.php b/module/execution/control.php
index 6a9879b800..19555b5011 100644
--- a/module/execution/control.php
+++ b/module/execution/control.php
@@ -1021,7 +1021,7 @@ class execution extends control
         }
         elseif(!empty($products))
         {
-            $productID  = reset($products)->id;
+            $productID  = empty($productID) ? reset($products)->id : $productID;
             $moduleTree = $this->tree->getTreeMenu($productID, 'bug', 0, array('treeModel', 'createBugLink'), $extra + array('productID' => $productID), 'all');
         }
         else
diff --git a/module/project/control.php b/module/project/control.php
index 5960521552..68ab495de9 100644
--- a/module/project/control.php
+++ b/module/project/control.php
@@ -1078,7 +1078,7 @@ class project extends control
         }
         elseif(!empty($products))
         {
-            $productID  = reset($products)->id;
+            $productID  = empty($productID) ? reset($products)->id : $productID;
             $moduleTree = $this->tree->getTreeMenu($productID, 'bug', 0, array('treeModel', 'createBugLink'), $extra + array('productID' => $productID), 'all');
         }
         else