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

* Code for task#86981.

Browse Source
This commit is contained in:
xieqiyu
2023-03-24 05:40:41 +00:00
parent d655beb156
commit c53a2ff5e5
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/upgrade/model.php
+2 -2
View File
@@ -8568,7 +8568,7 @@ class upgradeModel extends model
$charts = $this->dao->select('*')->from(TABLE_CHART)->fetchAll('id');
$dashboardLayoutPairs = $this->dao->select('id, layout')->from(TABLE_DASHBOARD)->fetchPairs();
$dataviewList = $this->dao->select('t1.code,t1.sql,t1.fields')->from(TABLE_DATAVIEW)->alias('t1')
$dataviewList = $this->dao->select('t1.code,t1.view,t1.fields')->from(TABLE_DATAVIEW)->alias('t1')
->leftJoin(TABLE_CHART)->alias('t2')->on('t1.code = t2.dataset')
->where('t2.id')->in(array_keys($charts))
->fetchAll('code');
@@ -8598,7 +8598,7 @@ class upgradeModel extends model
if(isset($dataviewList[$chart->dataset]))
{
$dataview = $dataviewList[$chart->dataset];
$data->sql = isset($dataview->sql) ? $dataview->sql : '';
$data->sql = 'SELECT * FROM ' . $dataview->view;
$data->fields = isset($dataview->fields) ? $dataview->fields : '';
}