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

* Fix bug for pivot design show origin.

Browse Source
This commit is contained in:
songchenxuan
2024-02-28 16:26:17 +08:00
committed by caoyanyi
parent 76d90615a5
commit 65386d5fd4
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/pivot/model.php
+3 -3
View File
@@ -1634,10 +1634,10 @@ class pivotModel extends model
$sliceRecord->$sliceField = $count == 0 ? 0 : round($sum / $count, 2);
break;
case 'max':
$sliceRecord->$sliceField = round(max($sliceStat), 2);
$sliceRecord->$sliceField = $sliceStat ? round(max($sliceStat), 2) : 0;
break;
case 'min':
$sliceRecord->$sliceField = round(min($sliceStat), 2);
$sliceRecord->$sliceField = $sliceStat ? round(min($sliceStat), 2) : 0;
break;
case 'count':
$sliceRecord->$sliceField = $sliceStat;
@@ -2195,7 +2195,7 @@ class pivotModel extends model
$col->label = $colLabel;
$slice = zget($column, 'slice', 'noSlice');
if($slice != 'noSlice')
if($slice != 'noSlice' && !$showOrigin)
{
if(!isset($cols[1]))
{