Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* [misc,0.5h] fix bug.

Browse Source
This commit is contained in:
qixinzhi
2024-09-04 16:10:43 +08:00
committed by 代婷婷
parent 53a60ca36f
commit 85ed35bb6b
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/pivotstate/pivotstate.class.php
+4 -3
View File
@@ -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);
}
}