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

* Finish a task #45544.

See merge request easycorp/zentaopms!928
This commit is contained in:
朱金勇
2021-12-14 05:34:42 +00:00
12 changed files with 85 additions and 152 deletions
+1 -1
View File
@@ -3120,7 +3120,7 @@ class executionModel extends model
foreach($products as $product)
{
$productModules = $this->loadModel('tree')->getOptionMenu($product->id);
$productBuilds = $this->loadModel('build')->getProductBuildPairs($product->id, 'all', $params = 'noempty|notrunk|withbranch');
$productBuilds = $this->loadModel('build')->getBuildPairs($product->id, 'all', $params = 'noempty|notrunk|withbranch');
foreach($productModules as $moduleID => $moduleName)
{
$modules[$moduleID] = ((count($products) >= 2 and $moduleID) ? $product->name : '') . $moduleName;