From 769604ebd8e30bb84ee1aff96ddb64c4e117f25a Mon Sep 17 00:00:00 2001
From: qixinzhi <qixinzhi@easycorp.ltd>
Date: Fri, 3 Nov 2023 05:33:07 +0000
Subject: [PATCH] * Fix display with summary when only one row in pivot.

---
 module/pivot/model.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/module/pivot/model.php b/module/pivot/model.php
index 2cf48bf5e1..c1fe220186 100644
--- a/module/pivot/model.php
+++ b/module/pivot/model.php
@@ -1652,7 +1652,7 @@ class pivotModel extends model
                 $rowIndex = 0;
                 foreach($columnRows as $key => $row)
                 {
-                    $count = $rowcount[$key];
+                    $count = isset($rowcount[$key]) ? $rowcount[$key] : 1;
                     for($i = 0; $i < $count; $i++)
                     {
                         if(!isset($groupsRow[$rowIndex])) $groupsRow[$rowIndex] = new stdclass();
@@ -2267,14 +2267,17 @@ class pivotModel extends model
         $table  = "<table class='reportData table table-condensed table-striped table-bordered table-fixed datatable' style='width: auto; min-width: 100%' data-fixed-left-width='400'>";
 
         $showOrigins = array();
+        $hasShowOrigin = false;
 
         foreach($data->cols[0] as $col)
         {
             $colspan = zget($col, 'colspan', 1);
             $colShowOrigin = array_fill(0, $colspan, $col->showOrigin);
             $showOrigins = array_merge($showOrigins, $colShowOrigin);
+            if($col->showOrigin) $hasShowOrigin = true;
         }
 
+
         /* Init table thead. */
         $table .= "<thead>";
         foreach($data->cols as $lineCols)
@@ -2313,7 +2316,7 @@ class pivotModel extends model
                 $hidden  = isset($configs[$i][$j]) ? false : (!$isGroup ? false : true);
 
                 $showOrigin = $showOrigins[$j];
-                if(!$isGroup && !$showOrigin)
+                if($hasShowOrigin && !$isGroup && !$showOrigin)
                 {
                     $rowspan = isset($configs[$i]) ? end($configs[$i]) : 1;
                     $hidden  = isset($configs[$i]) ? false : true;