Merge branch 'zentaopms_261_bug_#29948' into 'master'

* Fix bug #29948.

See merge request easycorp/zentaopms!6247
This commit is contained in:
王怡栋
2022-11-18 07:19:49 +00:00
+1 -1
View File
@@ -5091,7 +5091,7 @@ class executionModel extends model
$this->config->execution->all->search['actionURL'] = $actionURL;
$projectPairs = array(0 => '');
$projectPairs += $this->loadModel('project')->getPairsByProgram();
$projectPairs += $this->loadModel('project')->getPairsByProgram('', 'all', false, 'order_asc', '', '', 'multiple');
$this->config->execution->all->search['params']['project']['values'] = $projectPairs + array('all' => $this->lang->execution->allProject);
$this->loadModel('search')->setSearchParams($this->config->execution->all->search);