Merge branch 'master' into sprint/feedback_module

2022-10-11 09:33:25 +08:00
parent d1c02c34c0 70d4ffb566
commit 91ae21caec
381 changed files with 17770 additions and 2099 deletions
@@ -1453,7 +1453,7 @@ class treeModel extends model
        $module = $this->getById((int)$moduleID);
        if(empty($module)) return array();

-        return $this->dao->select('id')->from(TABLE_MODULE)->where("CONCAT(',', path, ',')")->like("%,$module->path,%")->andWhere('deleted')->eq(0)->fetchPairs();
+        return $this->dao->select('id')->from(TABLE_MODULE)->where("CONCAT(',', path, ',')")->like("%$module->path%")->andWhere('deleted')->eq(0)->fetchPairs();
    }

    /**