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

* [bug#56718] fix view deleted doc.

Browse Source
This commit is contained in:
dingyongliang
2024-11-04 16:57:57 +08:00
committed by 田淑杰
parent b896f52fff
commit a3b4482cce
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/doc/model.php
+2 -4
View File
@@ -735,8 +735,7 @@ class docModel extends model
{
$docs = $this->dao->select('t1.*')->from(TABLE_DOC)->alias('t1')
->leftJoin(TABLE_MODULE)->alias('t2')->on('t1.module=t2.id')
->where('t1.deleted')->eq(0)
->andWhere('t1.lib')->in($libs)
->where('t1.lib')->in($libs)
->andWhere('t1.vision')->eq($this->config->vision)
->andWhere('t1.templateType')->eq('')
->andWhere("(t1.status = 'normal' or (t1.status = 'draft' and t1.addedBy='{$this->app->user->account}'))")
@@ -746,8 +745,7 @@ class docModel extends model
->fetchAll('id');
$rootDocs = $this->dao->select('*')->from(TABLE_DOC)
->where('deleted')->eq(0)
->andWhere('lib')->in($libs)
->where('lib')->in($libs)
->andWhere('vision')->eq($this->config->vision)
->andWhere('templateType')->eq('')
->andWhere("(status = 'normal' or (status = 'draft' and addedBy='{$this->app->user->account}'))")