From 02f2bd22c6fca90b444e01fb4aee3927a231e96e Mon Sep 17 00:00:00 2001 From: hufangzhou Date: Wed, 20 Oct 2021 11:07:24 +0800 Subject: [PATCH] * Fix bug #15669. --- module/doc/model.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/module/doc/model.php b/module/doc/model.php index fabfa09110..897e091ad4 100644 --- a/module/doc/model.php +++ b/module/doc/model.php @@ -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(); }