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

* [bug] fix equal in php72.

Browse Source
This commit is contained in:
qixinzhi
2024-10-29 09:45:50 +08:00
committed by 朱金勇
parent c033bc41a6
commit a43a4c8ee7
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/pivot/model.php
+5 -5
View File
@@ -1294,7 +1294,7 @@ class pivotModel extends model
$groupValue = $getGroupValue($record, $group, $groupIndex);
$groupValueStr = implode('_', $groupValue);
if($groupValue[0] != '$total$' && $groupValueStr == $lastGroupValue[$group] && isset($groupsRowSpan[$group]))
if($groupValue[0] !== '$total$' && $groupValueStr === $lastGroupValue[$group] && isset($groupsRowSpan[$group]))
{
$groupRowSpan = array_pop($groupsRowSpan[$group]);
$groupRowSpan['index'][] = $index;
@@ -1371,7 +1371,7 @@ class pivotModel extends model
{
if(!isset($column['percentage'])) continue;
$percentage = $column['percentage'];
if($percentage[4] == $columnKey) $total += $column['value'];
if($percentage[4] === $columnKey) $total += $column['value'];
}
$cell['percentage'][1] = $total;
}
@@ -1483,7 +1483,7 @@ class pivotModel extends model
{
return array_filter($records, function($record) use ($field, $value)
{
return $record->$field == $value;
return $record->$field === $value;
});
}
@@ -1638,7 +1638,7 @@ class pivotModel extends model
if(!is_numeric($number)) return $number;
$number = (float)$number;
if(floor($number) == $number) return $number;
if(floor($number) === $number) return $number;
$decimalPart = explode('.', strval($number));
if(isset($decimalPart[1]) && strlen($decimalPart[1]) > 2) return helper::formatHours($number);
@@ -1652,7 +1652,7 @@ class pivotModel extends model
$arrayValue = false;
foreach($record as $colKey => $cell)
{
$cellValue = $cell['value'] == '$total$' ? $this->lang->pivot->total : $cell['value'];
$cellValue = $cell['value'] === '$total$' ? $this->lang->pivot->total : $cell['value'];
if(is_array($cellValue)) $arrayValue = $cellValue;
$cellValue = $roundIfMoreThanTwoDecimals($cellValue);