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

Merge branch 'master' of https://github.com/easysoft/zentaopms

Browse Source
This commit is contained in:
Catouse
2018-05-29 10:49:11 +08:00
parent b71bf23f30 2e10a89e49
commit 2bb0b815aa
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/doc/model.php
+8 -5
View File
@@ -382,16 +382,19 @@ class docModel extends model
{
if($this->session->searchDoc == false) return array();
$docIdList = $this->getPrivDocs($libID, $moduleID);
$docs = $this->dao->select('*')->from(TABLE_DOC)
->where('id')->in($docIdList)
->andWhere('title')->like("%{$this->session->searchDoc}%")
->andWhere('lib')->in($allLibs)
$docs = $this->dao->select('t1.*')->from(TABLE_DOC)->alias('t1')
->leftJoin(TABLE_DOCCONTENT)->alias('t2')->on('t2.doc = t1.id')
->where('t1.deleted')->eq(0)
->andWhere('t1.id')->in($docIdList)
->andWhere('t1.title', true)->like("%{$this->session->searchDoc}%")
->orWhere('t2.content')->like("%{$this->session->searchDoc}%")->markRight(1)
->andWhere('t1.lib')->in($allLibs)
->orderBy($sort)
->page($pager)
->fetchAll();
}
$this->loadModel('common')->saveQueryCondition($this->dao->get(), 'doc');
$this->loadModel('common')->saveQueryCondition($this->dao->get(), 'doc', false);
if(!$docs) return array();
foreach($docs as $index => $doc)