Merge branch 'tianshujie_fixBug' into 'master'

* Fix bug #18287.

See merge request easycorp/zentaopms!1321
This commit is contained in:
孙广明
2022-01-10 05:35:22 +00:00
+1 -1
View File
@@ -79,7 +79,7 @@
$branchTagOption = array();
$product = $this->product->getByID($bug->product);
$plans = $this->loadModel('productplan')->getPairs($bug->product, $branch);
$branches = $product->type == 'normal' ? array('' => '') : $this->loadModel('branch')->getList($product->id, 0 ,'all');;
$branches = $product->type == 'normal' ? array() : $this->loadModel('branch')->getList($product->id, 0 ,'all');
foreach($branches as $branchInfo)
{
$branchTagOption[$branchInfo->id] = $branchInfo->name . ($branchInfo->status == 'closed' ? ' (' . $this->lang->branch->statusList['closed'] . ')' : '');