Merge branch 'sprint/170_tianshujie_16528' into 'sprint/170'

* Fix bug #16528. See merge request easycorp/zentaopms!573
2021-11-22 03:50:10 +00:00
parent 9c9203ca18 a1c59d2ca0
commit 89149f1ca9
1 changed files with 1 additions and 1 deletions
@@ -512,7 +512,7 @@ class bug extends control
        }
        else
        {
-            $branches = (isset($product->type) and $product->type != 'normal') ? $this->loadModel('branch')->getPairs($productID, 'active') : array();
+            $branches = $productInfo->type != 'normal' ? $this->loadModel('branch')->getPairs($productID, 'active') : array();
        }

        /* Replace the value of bug that needs to be replaced with the value of the object that is transferred to bug. */