Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_304

2023-04-20 15:22:32 +08:00
parent 97cea7a9d6 1d45e86bda
commit 01ffcbef5d
21 changed files with 58 additions and 49 deletions
@@ -8969,7 +8969,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');