* Fix bug for system metric pager.

This commit is contained in:
songchenxuan
2023-12-20 14:44:57 +08:00
parent 7661918a84
commit 52175d10e3
+4 -4
View File
@@ -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();
}
/**