From a43a4c8ee76347a476cb19a5d88ce1abd71d5a58 Mon Sep 17 00:00:00 2001 From: qixinzhi Date: Mon, 28 Oct 2024 08:19:30 +0000 Subject: [PATCH] * [bug] fix equal in php72. --- module/pivot/model.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/module/pivot/model.php b/module/pivot/model.php index 9b1608d10e..c8ac0b490c 100644 --- a/module/pivot/model.php +++ b/module/pivot/model.php @@ -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);