From c8df5b435f744b2d895d72cd3948c62929d9fdea Mon Sep 17 00:00:00 2001 From: liugang Date: Wed, 9 Nov 2022 15:32:10 +0800 Subject: [PATCH] * Save report module to the collector field. --- module/upgrade/model.php | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/module/upgrade/model.php b/module/upgrade/model.php index 575f6e0be6..85a07a55a2 100644 --- a/module/upgrade/model.php +++ b/module/upgrade/model.php @@ -7600,21 +7600,23 @@ class upgradeModel extends model $group->order = 10; $modules = array(); - foreach($this->lang->crystal->moduleList as $code => $name) + foreach($this->lang->crystal->moduleList as $module => $name) { - if(!$code || !$name) continue; + if(!$module || !$name) continue; - $group->name = $name; + $group->name = $name; + $group->collector = $module; $this->dao->replace(TABLE_MODULE)->data($group)->exec(); - $modules[$code] = $this->dao->lastInsertID(); + $modules[$module] => $this->dao->lastInsertID(); $group->order += 10; } $this->dao->update(TABLE_MODULE)->set("`path` = CONCAT(',', `id`, ',')") ->where('type')->eq($type) ->andWhere('grade')->eq('1') - ->andWhere('path')->eq('')->exec(); + ->andWhere('path')->eq('') + ->exec(); return $modules; }