Merge branch 'mayue_fix_bug#20316' into 'master'

* Fix bug #20316. See merge request easycorp/zentaopms!2674
2022-04-01 06:04:15 +00:00
parent 8e826135a6 4084429fe6
commit c29914b58b
1 changed files with 1 additions and 1 deletions
@@ -335,7 +335,7 @@ class tree extends control
        if($showProduct)
        {
            $product = $this->loadModel('product')->getById($module->root);
-            if($product->type != 'normal') $this->view->branches = $this->loadModel('branch')->getPairs($module->root);
+            if($product->type != 'normal') $this->view->branches = $this->loadModel('branch')->getPairs($module->root, 'active');
            $this->view->product  = $product;
            $this->view->products = $this->product->getPairs('', $product->program);
        }