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

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

Browse Source
This commit is contained in:
wangyidong
2017-08-16 13:33:11 +08:00
parent a25a10d542 0480e28e67
commit ef4cbfd1e3
6 changed files with 87 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/doc/model.php
+3 -3
View File
@@ -914,7 +914,7 @@ class docModel extends model
* @access public
* @return array
*/
public function getLibFiles($type, $objectID, $pager = null)
public function getLibFiles($type, $objectID, $orderBy, $pager = null)
{
if($type != 'project' and $type != 'product') return true;
$this->loadModel('file');
@@ -936,7 +936,7 @@ class docModel extends model
->orWhere("(objectType = 'productplan' and objectID in ($planIdList))")
->markRight(1)
->beginIF($searchTitle)->andWhere('title')->like("%{$searchTitle}%")->fi()
->orderBy('t1.id desc')
->orderBy($orderBy)
->page($pager)
->fetchAll('id');
}
@@ -952,7 +952,7 @@ class docModel extends model
->orWhere("(objectType = 'build' and objectID in ($buildIdList))")
->markRight(1)
->beginIF($searchTitle)->andWhere('title')->like("%{$searchTitle}%")->fi()
->orderBy('t1.id desc')
->orderBy($orderBy)
->page($pager)
->fetchAll('id');
}