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

This commit is contained in:
wangyidong
2017-08-14 10:05:57 +08:00
4 changed files with 12 additions and 1 deletions
+2
View File
@@ -936,6 +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')
->page($pager)
->fetchAll('id');
}
@@ -951,6 +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')
->page($pager)
->fetchAll('id');
}