From 0a57ff808d1065906035bc5fc7eac7b752197878 Mon Sep 17 00:00:00 2001
From: xieqiyu <xieqiyu@easycorp.ltd>
Date: Thu, 27 Apr 2023 13:06:24 +0000
Subject: [PATCH] * Code for bug#34828.

---
 module/install/control.php |  2 ++
 module/upgrade/model.php   | 11 ++++++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/module/install/control.php b/module/install/control.php
index 5716ef95db..4ccebef0c1 100644
--- a/module/install/control.php
+++ b/module/install/control.php
@@ -271,6 +271,8 @@ class install extends control
             if(isset($_SERVER['REQUEST_SCHEME']) and strtolower($_SERVER['REQUEST_SCHEME']) == 'https') $httpType = 'https';
             if(strpos($this->app->getClientLang(), 'zh') === 0) $this->loadModel('api')->createDemoData($this->lang->api->zentaoAPI, "{$httpType}://{$_SERVER['HTTP_HOST']}" . $this->app->config->webRoot . 'api.php/v1', '16.0');
 
+            if($this->config->edition != 'open') $this->upgrade->processDataset();
+
             return print(js::locate(inlink('step6'), 'parent'));
         }
 
diff --git a/module/upgrade/model.php b/module/upgrade/model.php
index e150a5ccbd..faa7cb4a30 100644
--- a/module/upgrade/model.php
+++ b/module/upgrade/model.php
@@ -599,6 +599,9 @@ class upgradeModel extends model
                 $this->convertDocCollect();
                 $this->addBIUpdateMark();
                 break;
+            case '18_4_alpha1':
+                if($this->config->edition != 'open') $this->processDataset();
+                break;
         }
 
         $this->deletePatch();
@@ -760,6 +763,7 @@ class upgradeModel extends model
                 $this->processChart();
                 $this->processReport();
                 $this->processDashboard();
+                break;
         }
     }
 
@@ -8076,6 +8080,9 @@ class upgradeModel extends model
         /* Process built-in dataset. */
         foreach($this->lang->dataset->tables as $code => $dataset)
         {
+            $sameCodeList = $this->dao->select('*')->from(TABLE_DATAVIEW)->where('code')->eq($code)->fetchAll();
+            if(!empty($sameCodeList)) continue;
+
             $dataview->name = $dataset['name'];
             $dataview->code = $code;
             $dataview->view = 'ztv_' . $code;
@@ -8123,6 +8130,9 @@ class upgradeModel extends model
             if(!empty($dataview->view) and !empty($dataview->sql)) $this->dataview->createViewInDB($dataviewID, $dataview->view, $dataview->sql);
         }
 
+        $customDataset = $this->dao->select('*')->from(TABLE_DATASET)->fetchAll('id');
+        if(empty($customDataset)) return true;
+
         /* Create custom module. */
         $defaultModuleID = $this->dao->select('id')->from(TABLE_MODULE)->where('type')->eq('dataview')->andWhere('name')->eq($this->lang->dataview->default)->fetch('id');
         if(empty($defaultModuleID))
@@ -8144,7 +8154,6 @@ class upgradeModel extends model
         $dataview->group = $defaultModuleID;
 
         /* Process custom dataset. */
-        $customDataset = $this->dao->select('*')->from(TABLE_DATASET)->fetchAll('id');
         foreach($customDataset as $datasetID => $dataset)
         {
             $dataview->name        = $dataset->name;