Merge branch 'sprint/fixbug_hufangzhou_21822' into 'master'

* Fix bug #21822. See merge request easycorp/zentaopms!2988
2022-04-18 07:19:13 +00:00
parent 0b1e89ea93 ddb4ab243a
commit 7155d82189
1 changed files with 4 additions and 1 deletions
@@ -25,7 +25,10 @@ class branch extends control
     */
    public function manage($productID, $browseType = 'active', $orderBy = 'order', $recTotal = 0, $recPerPage = 20, $pageID = 1)
    {
-        $this->loadModel('product')->setMenu($productID);
+        $product = $this->loadModel('product')->getById($productID);
+        if($product->type == 'normal') $this->locate($this->createLink('product', 'view', "productID=$productID"));
+
+        $this->product->setMenu($productID);
        $this->session->set('branchManage', $this->app->getURI(true), 'product');
        $this->branch->changeBranchLanguage($productID);