* code for task #44321.

This commit is contained in:
王怡栋
2021-11-18 11:20:39 +08:00
parent fc50ece3e2
commit 3510f6ef63
7 changed files with 93 additions and 10 deletions
+4 -6
View File
@@ -80,6 +80,7 @@ class docModel extends model
->where('deleted')->eq(0)
->beginIF($type)->andWhere('type')->eq($type)->fi()
->beginIF(!$type)->andWhere('type')->ne('api')->fi()
->beginIF($objectID and strpos(',product,project,execution,', ",$type,"))->andWhere($type)->eq($objectID)->fi()
->orderBy('`order`, id desc')->query();
}
@@ -88,7 +89,7 @@ class docModel extends model
$executions = $this->loadModel('execution')->getPairs();
$libPairs = array();
while ($lib = $stmt->fetch())
while($lib = $stmt->fetch())
{
if($lib->product != 0 and !isset($products[$lib->product])) continue;
if($lib->execution != 0 and !isset($executions[$lib->execution])) continue;
@@ -110,7 +111,7 @@ class docModel extends model
if(!empty($appendLibs))
{
$stmt = $this->dao->select('*')->from(TABLE_DOCLIB)->where('id')->in($appendLibs)->orderBy('`order`, id desc')->query();
while ($lib = $stmt->fetch())
while($lib = $stmt->fetch())
{
if(!isset($libPairs[$lib->id]) and $this->checkPrivLib($lib, $extra)) $libPairs[$lib->id] = $lib->name;
}
@@ -1623,10 +1624,7 @@ class docModel extends model
static $docGroups;
if(empty($docGroups))
{
$docs = $this->dao->select('*')->from(TABLE_DOC)
->where('lib')->eq((int)$libID)
->andWhere('deleted')->eq(0)
->fetchAll();
$docs = $this->dao->select('*')->from(TABLE_DOC)->where('lib')->eq((int)$libID)->andWhere('deleted')->eq(0)->fetchAll();
$docGroups = array();
foreach($docs as $doc)
{