Merge branch 'master' into zentaopms_239

2022-09-30 09:07:53 +08:00
parent daa0ea847c 8e28c42e0f
commit d300ee00da
244 changed files with 6448 additions and 967 deletions
@@ -1452,7 +1452,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();
    }

    /**