Merge branch 'sprint/173_xieqiyu_14507' into 'sprint/170'

* Fix bug#16507. See merge request easycorp/zentaopms!594
2021-11-22 08:35:58 +00:00
parent 827a5a6529 e7578880a7
commit 74185a47fe
1 changed files with 1 additions and 1 deletions
@@ -50,7 +50,7 @@ class tree extends control
            if(empty($product)) $this->locate($this->createLink('product', 'create'));
            if(!empty($product->type) && $product->type != 'normal')
            {
-                $branches = $this->loadModel('branch')->getPairs($product->id, 'active');
+                $branches = $this->loadModel('branch')->getPairs($product->id);
                if($currentModuleID)
                {
                    $branchName = $branches[$branch];