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

* [bug#61958,done,0.2h,0h] Fix search doc by keyword error.

Browse Source
This commit is contained in:
wangyuting
2025-04-25 09:47:48 +08:00
committed by 王于听
parent 6c49241883
commit 88e82ae53c
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/doc/model.php
+3 -1
View File
@@ -939,7 +939,7 @@ class docModel extends model
*/
public function getMySpaceDocs(string $type, string $browseType, string $query = '', string $orderBy = 'id_desc', object $pager = null): array
{
if(!in_array($type, array('view', 'collect', 'createdby', 'editedby'))) return array();
if(!in_array($type, array('all', 'view', 'collect', 'createdby', 'editedby'))) return array();
$allLibs = $this->getLibs('all');
$allLibIDList = array_keys($allLibs);
@@ -988,6 +988,8 @@ class docModel extends model
->beginIF(!common::hasPriv('doc', 'teamSpace'))->andWhere('t2.type')->ne('custom')->fi()
->beginIF($browseType == 'draft')->andWhere('t1.status')->eq('draft')->andWhere('t1.addedBy')->eq($this->app->user->account)->fi()
->beginIF($browseType == 'bysearch')->andWhere($query)->fi()
->beginIF($browseType == 'bykeyword')->andWhere('t1.status')->eq('normal')->fi()
->beginIF($browseType == 'bykeyword' && $query)->andWhere('t1.title')->like("%$query%")->fi()
->beginIF(!empty($hasPrivDocIdList))->andWhere('t1.id')->in($hasPrivDocIdList)->fi()
->orderBy($orderBy)
->page($pager)