diff --git a/module/metric/tao.php b/module/metric/tao.php index 5929adfb2b..d645f20c4b 100644 --- a/module/metric/tao.php +++ b/module/metric/tao.php @@ -259,7 +259,7 @@ class metricTao extends metricModel $wrapFields = array_map(fn($value) => "`$value`", $fieldList); $dataFieldStr = implode(',', $wrapFields); - $records = $this->dao->select($dataFieldStr) + $stmt = $this->dao->select($dataFieldStr) ->from(TABLE_METRICLIB) ->where('metricCode')->eq($code) ->beginIF($metricScope != 'system')->andWhere($metricScope)->in($objectList)->fi() @@ -274,10 +274,10 @@ class metricTao extends metricModel ->beginIF(!empty($dateEnd) and $dateType == 'day')->andWhere('CONCAT(`year`, `month`, `day`)')->le($dayEnd)->fi() ->beginIF(!empty($calcDate))->andWhere('date')->ge($calcDate)->fi() ->beginIF(!empty($scopeList))->orderBy("date desc, $scopeKey, year desc, month desc, week desc, day desc")->fi() - ->beginIF(empty($scopeList))->orderBy("date desc, year desc, month desc, week desc, day desc")->fi() - ->fetchAll(); + ->beginIF(empty($scopeList))->orderBy("date desc, year desc, month desc, week desc, day desc")->fi(); - return $records; + if($metricScope == 'system') $stmt = $stmt->page($pager); // beginIF not work with page() + return $stmt->fetchAll(); } /**