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

* Fix bug #15669.

Browse Source
This commit is contained in:
hufangzhou
2021-10-20 11:07:24 +08:00
parent 409f2936cb
commit 02f2bd22c6
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/doc/model.php
+5 -2
View File
@@ -69,7 +69,9 @@ class docModel extends model
if($type == 'all' or $type == 'includeDeleted')
{
$stmt = $this->dao->select('*')->from(TABLE_DOCLIB)
->beginIF($type == 'all')->where('deleted')->eq(0)->fi()
->where(1)
->beginIF($type == 'all')->andWhere('deleted')->eq(0)->fi()
->andWhere('type')->ne('api')
->orderBy('id_desc')
->query();
}
@@ -77,7 +79,8 @@ class docModel extends model
{
$stmt = $this->dao->select('*')->from(TABLE_DOCLIB)
->where('deleted')->eq(0)
->beginIF($type)->andWhere('type')->eq($type)->fi()
->beginIF($type and $type != 'api')->andWhere('type')->eq($type)->fi()
->andWhere('type')->ne('api')
->orderBy('`order`, id desc')->query();
}