From f0f66cdf260691c578efcd7b211c980e2d9bae31 Mon Sep 17 00:00:00 2001 From: songchenxuan Date: Mon, 18 Dec 2023 14:01:57 +0800 Subject: [PATCH] * Fix metric test bug. --- module/metric/test/calc.class.php | 2 +- module/metric/test/model/getmetricsbyidlist.php | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/module/metric/test/calc.class.php b/module/metric/test/calc.class.php index 4798fcec3c..3eea19d8aa 100644 --- a/module/metric/test/calc.class.php +++ b/module/metric/test/calc.class.php @@ -78,7 +78,7 @@ class metricTest */ public function getList($scope, $stage = 'all', $sort = 'id_desc') { - return $this->objectModel->getList($scope, $stage, $param, '', 0, $sort); + return $this->objectModel->getList($scope, $stage, 0, '', 0, $sort); } /** diff --git a/module/metric/test/model/getmetricsbyidlist.php b/module/metric/test/model/getmetricsbyidlist.php index fa3ec44049..b9e9be78d4 100644 --- a/module/metric/test/model/getmetricsbyidlist.php +++ b/module/metric/test/model/getmetricsbyidlist.php @@ -13,6 +13,6 @@ pid=1 */ -r($metric->getMetricsByIDList('1,2')) && p('1:code') && e('count_of_doing_program'); // 使用字符串传入获取metric -r($metric->getMetricsByIDList(array(1,2))) && p('0:code') && e('count_of_program'); // 使用数组传入获取metric -r($metric->getMetricsByIDList('')) && p() && e('0'); // 传入一个空字符串没有metric返回 +r($metric->getMetricsByIDList('1,2')) && p('0:code;1:code') && e('count_of_program,count_of_doing_program'); // 使用字符串传入获取metric +r($metric->getMetricsByIDList(array(1,2))) && p('0:code;1:code') && e('count_of_program,count_of_doing_program'); // 使用数组传入获取metric +r($metric->getMetricsByIDList('')) && p() && e('0'); // 传入一个空字符串没有metric返回