Merge pull request '* Fix bug #33665.' (#11) from daitingting_bug_#33665 into 18.4

Reviewed-on: https://git.zcorp.cc/easycorp/zentaopms/pulls/11

module/upgrade/model.php

@@ -9051,7 +9051,7 @@ class upgradeModel extends model
 
             /* Process settings. */
             $settings = new stdclass();
-            $settings->columns = array();
+            $columns  = array();
             if($report->params)
             {
                 $params = json_decode($report->params);
@@ -9060,7 +9060,6 @@ class upgradeModel extends model
                 $settings->group2      = $params->group2;
                 $settings->columnTotal = 'sum';
 
-                $columns = array();
                 foreach($params->reportField as $index => $field)
                 {
                     $column = new stdclass();
@@ -9081,14 +9080,24 @@ class upgradeModel extends model
 
                     $columns[] = $column;
                 }
-                $settings->columns = $columns;
             }
             else
             {
+                $column = new stdclass();
+                $column->field     = '';
+                $column->stat      = '';
+                $column->slice     = 'noSlice';
+                $column->showMode  = 'default';
+                $column->showTotal = 'noShow';
+
+                $columns[] = $column;
+
                 $data->stage = 'draft';
                 $data->step  = 1;
             }
 
+            $settings->columns = $columns;
+
             /* Process fieldSettings. */
             $sql = $data->sql;
             if(!empty($filters))