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

* Fix bug #34554.

Browse Source
This commit is contained in:
daitingting
2023-04-21 11:07:03 +08:00
parent d6573d4bac
commit eb61d3c874
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/upgrade/model.php
+2 -4
View File
@@ -8963,7 +8963,7 @@ class upgradeModel extends model
{
$reports = $this->dao->select('*')->from(TABLE_REPORT)->fetchAll();
$groupCollectors = $this->dao->select('collector, id')->from(TABLE_MODULE)->where('type')->eq('pivot')->andWhere('root')->eq(1)->fetchPairs();
$groupCollectors = $this->dao->select('collector, id')->from(TABLE_MODULE)->where('type')->eq('pivot')->andWhere('root')->eq(1)->andWhere('collector')->ne('')->fetchPairs();
$this->loadModel('pivot');
@@ -8982,12 +8982,10 @@ class upgradeModel extends model
$data->createdDate = $report->addedDate;
/* Process group. */
$modules = explode(',', $report->module);
$modules = explode(',', trim($report->module, ','));
$groups = array();
foreach($modules as $module)
{
if(!$module) continue;
if(isset($groupCollectors[$module]))
{
$groups[] = $groupCollectors[$module];