Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3

This commit is contained in:
holan20180123
2021-05-14 14:32:48 +08:00
2 changed files with 2 additions and 1 deletions

View File

@@ -136,6 +136,7 @@ define('TABLE_EXPECT', '`' . $config->db->prefix . 'expect`');
define('TABLE_STAKEHOLDER', '`' . $config->db->prefix . 'stakeholder`');
define('TABLE_STORY', '`' . $config->db->prefix . 'story`');
define('TABLE_STORYSPEC', '`' . $config->db->prefix . 'storyspec`');
define('TABLE_STORYREVIEW', '`' . $config->db->prefix . 'storyreview`');
define('TABLE_STORYSTAGE', '`' . $config->db->prefix . 'storystage`');
define('TABLE_STORYESTIMATE', '`' . $config->db->prefix . 'storyestimate`');
define('TABLE_PRODUCTPLAN', '`' . $config->db->prefix . 'productplan`');

View File

@@ -1046,7 +1046,7 @@ class productModel extends model
$projectIdList = array();
foreach($executions as $id => $execution) $projectIdList[$execution->project] = $execution->project;
$executionPairs = array();
$executionPairs = array(0 => '');
$projectPairs = $this->loadModel('project')->getPairsByIdList($projectIdList);
foreach($executions as $id => $execution)
{