Merge branch 'sprint/170_xieqiyu_fixbug' into 'sprint/170'

* Fix bug. See merge request easycorp/zentaopms!341
2021-11-08 07:59:30 +00:00
parent 09d50fd19c eb8300049f
commit 784eba13ab
1 changed files with 1 additions and 1 deletions
@@ -413,7 +413,7 @@ class productplan extends control
        else
        {
            $this->config->product->search['fields']['branch'] = $this->lang->product->branch;
-            $branches = array('' => '', $this->loadModel('branch')->getPairs($plan->product);
+            $branches = array('' => '') + $this->loadModel('branch')->getPairs($plan->product);
            if($plan->branch) $branches = array('' => '', $plan->branch => $branches[$plan->branch]);
            $this->config->product->search['params']['branch']['values'] = $branches;
        }