diff --git a/module/project/model.php b/module/project/model.php index b77a9d241c..c63193f55a 100755 --- a/module/project/model.php +++ b/module/project/model.php @@ -892,7 +892,7 @@ class projectModel extends model return $this->dao->select('project, id')->from(TABLE_PROJECT) ->where('multiple')->eq('0') ->andWhere('deleted')->eq('0') - ->fetchPairs(); + ->fetchPairs('id', 'project'); } /** diff --git a/module/project/test/model/getprojectexecutionpairs.php b/module/project/test/model/getprojectexecutionpairs.php index 7e4a24757b..ab05ebc50e 100644 --- a/module/project/test/model/getprojectexecutionpairs.php +++ b/module/project/test/model/getprojectexecutionpairs.php @@ -18,4 +18,7 @@ $tester->loadModel('project'); $project = $tester->project->getProjectExecutionPairs(); -r(count($project)) && p() && e('6'); +r(count($project)) && p() && e('6'); //查看全部项目与执行键值对数组数量为6 +r($project[4]) && p() && e('3'); //查看瀑布项目编号为3的阶段4 +r($project[5]) && p() && e('3'); //查看瀑布项目编号为3的阶段5 +r($project[6]) && p() && e('0'); //查看scrum项目编号为6的无执行 diff --git a/module/project/test/model/yaml/getprojectexecutionpairs/project.yaml b/module/project/test/model/yaml/getprojectexecutionpairs/project.yaml index 1ed723c873..4525217271 100644 --- a/module/project/test/model/yaml/getprojectexecutionpairs/project.yaml +++ b/module/project/test/model/yaml/getprojectexecutionpairs/project.yaml @@ -14,6 +14,8 @@ fields: range: 'wait,doing,closed,suspended' - field: parent range: 0, 1, 0, 3, 3, 0 + - field: multiple + range: 0 - field: path range: '`,1,`, `,1,2,`, `,3,`, `,3,4,`, `,3,4,5,`, `,6,`' - field: hasProduct