Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* [misc] Change as to AS.

Browse Source
This commit is contained in:
xieqiyu
2025-05-15 17:27:57 +08:00
committed by 刘刚
parent 5bd3561e53
commit c07e8fb35c
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/upgrade/model.php
+3 -3
View File
@@ -10660,7 +10660,7 @@ class upgradeModel extends model
*/
public function getUpgradeDocs(): array
{
$docs = $this->dao->select('t1.*,t2.title,t2.content,t2.type as contentType,t2.rawContent,t1.version')->from(TABLE_DOC)->alias('t1')
$docs = $this->dao->select('t1.*,t2.title,t2.content,t2.type AS contentType,t2.rawContent,t1.version')->from(TABLE_DOC)->alias('t1')
->leftJoin(TABLE_DOCCONTENT)->alias('t2')->on('t1.id=t2.doc && t1.version=t2.version')
->where('t2.type')->in(array('doc', 'html'))
->andWhere('t1.status')->ne('draft')
@@ -10947,7 +10947,7 @@ class upgradeModel extends model
*/
public function getUpgradeDocTemplates(): array
{
$templateList = $this->dao->select('t1.*, t2.title, t2.content, t2.type as contentType, t1.version')->from(TABLE_DOC)->alias('t1')
$templateList = $this->dao->select('t1.*, t2.title, t2.content, t2.type AS contentType, t1.version')->from(TABLE_DOC)->alias('t1')
->leftJoin(TABLE_DOCCONTENT)->alias('t2')->on('t1.id = t2.doc && t1.version = t2.version')
->where('t1.deleted')->eq(0)
->andWhere('t1.templateType')->ne('')
@@ -11057,7 +11057,7 @@ class upgradeModel extends model
*/
public function convertWiki2Html(int $bookID = 0, int $nodeID = 0): string
{
$template = $this->dao->select('t1.*, t2.content as content')->from(TABLE_DOC)->alias('t1')
$template = $this->dao->select('t1.*, t2.content AS content')->from(TABLE_DOC)->alias('t1')
->leftJoin(TABLE_DOCCONTENT)->alias('t2')->on('t1.id = t2.doc')
->where('t1.id')->eq($nodeID ? $nodeID : $bookID)
->fetch();