Merge branch 'sprint/176_songchenxuan_45545' into 'master'

*Fix task #45545 bug. See merge request easycorp/zentaopms!941
2021-12-15 00:39:56 +00:00
parent 328379d956 731c7fb45c
commit b3b60dd4e4
1 changed files with 3 additions and 2 deletions
@@ -3707,9 +3707,10 @@ class executionModel extends model

        $param        = strtolower($param);
        $branchIDList = strpos($param, 'withmainplan') !== false ? array(BRANCH_MAIN => BRANCH_MAIN) : array();
-        foreach($products as $product)
+        $branchGroups   = $this->loadModel('branch')->getByProducts(array_keys($products), 'noclosed');
+        foreach($branchGroups as $branches)
        {
-            foreach($product->branches as $branchID) $branchIDList[$branchID] = $branchID;
+            foreach($branches as $branchID => $branchName) $branchIDList[$branchID] = $branchID;
        }

        $plans = $this->dao->select('id,title,product,parent,begin,end')->from(TABLE_PRODUCTPLAN)