Merge branch 'daitingting_upgrade' into 'master'

* Match the group of dimension 1. See merge request easycorp/zentaopms!7499
2023-04-20 05:22:16 +00:00
parent 5510129959 c4484f1ff9
commit 8e7db6d8ec
1 changed files with 1 additions and 1 deletions
@@ -8970,7 +8970,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')->fetchPairs();
+        $groupCollectors = $this->dao->select('collector, id')->from(TABLE_MODULE)->where('type')->eq('pivot')->andWhere('root')->eq(1)->fetchPairs();

        $this->loadModel('pivot');