From 85ed35bb6bc090726c342cbb2a16da87e89ab280 Mon Sep 17 00:00:00 2001 From: qixinzhi Date: Thu, 29 Aug 2024 08:47:50 +0000 Subject: [PATCH] * [misc,0.5h] fix bug. --- lib/pivotstate/pivotstate.class.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/pivotstate/pivotstate.class.php b/lib/pivotstate/pivotstate.class.php index 88ffb32ed0..71f1d1150c 100644 --- a/lib/pivotstate/pivotstate.class.php +++ b/lib/pivotstate/pivotstate.class.php @@ -773,11 +773,11 @@ class pivotState */ public function addGroupBy($type, $order, $select, $function = 'count') { - list($table, $field, $function) = array($select[0], $select[1], $select[3]); + list($table, $field, $selectFunc) = array($select[0], $select[1], $select[3]); $fieldList = $this->getTableDescList($table); $name = $table . '_' . $fieldList[$field]; - if(!empty($function)) $name = $name . '_' . $function; + if(!empty($selectFunc)) $name = $name . '_' . $selectFunc; $select[3] = $function; $select[4] = $name; @@ -925,7 +925,8 @@ class pivotState { foreach($groupByList as $index => $groupBy) { - list($table, $field, $function) = array($groupBy['select'][0], $groupBy['select'][1], $groupBy['select'][3]); + $select = $groupBy['select']; + list($table, $field, $function) = array($select[0], $select[1], $select[3]); $groupByList[$index] = array($table, $field, null, $function); } }