From f4b5e68afbfdef877f5009d4f476fa9a2fd7eb63 Mon Sep 17 00:00:00 2001 From: qixinzhi Date: Wed, 29 Nov 2023 14:22:48 +0800 Subject: [PATCH] * Fix no date metric with default query. --- module/metric/model.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/module/metric/model.php b/module/metric/model.php index fe03e90a2a..9a770a4b2a 100755 --- a/module/metric/model.php +++ b/module/metric/model.php @@ -1537,8 +1537,9 @@ class metricModel extends model return array($begin, $end); } - if($key == 'calcDate' && isset($query[$key])) + if($key == 'calcDate') { + if(!isset($query[$key]) && $query['dateType'] == 'nodate') $query['calcDate'] = 7; return date('Y-m-d', strtotime("-{$query[$key]} days")); }