diff --git a/module/doc/model.php b/module/doc/model.php index 0345287ff4..8271ac6020 100644 --- a/module/doc/model.php +++ b/module/doc/model.php @@ -1838,28 +1838,6 @@ class docModel extends model return $node; } - /** - * Get project-related document library IDs. - * - * @param int $projectID - * @access public - * @return array - */ - public function getLibIdListByProject($projectID = 0) - { - $products = $this->loadModel('product')->getProductIDByProject($projectID, false); - $executions = $this->loadModel('execution')->getPairs($projectID, 'all', 'noclosed,leaf'); - - $executionLibs = array(); - $productLibs = array(); - if($executions) $executionLibs = $this->dao->select('id')->from(TABLE_DOCLIB)->where('execution')->in(array_keys($executions))->fetchPairs(); - if($products) $productLibs = $this->dao->select('id')->from(TABLE_DOCLIB)->where('product')->in($products)->fetchPairs(); - $customLibs = $this->dao->select('id')->from(TABLE_DOCLIB)->where('type')->eq('custom')->fetchPairs(); - - $libIdList = array_merge($customLibs, $executionLibs, $productLibs); - return $libIdList; - } - /** * Get statistic information. * diff --git a/module/doc/test/model/getlibidlistbyproject.php b/module/doc/test/model/getlibidlistbyproject.php deleted file mode 100755 index eadbaddeac..0000000000 --- a/module/doc/test/model/getlibidlistbyproject.php +++ /dev/null @@ -1,26 +0,0 @@ -#!/usr/bin/env php -getLibIdListByProject(); -cid=1 -pid=1 - -测试未开始项目相关的库id >> 822;823 -测试进行中项目相关的库id >> 827;828 -测试已暂停项目相关的库id >> 87;97 -测试已关闭项目相关的库id >> 88;98 - -*/ - -$doc = new docTest(); -$t_numProjectID = array('11', '12', '17', '18'); - -r($doc->getLibIdListByProjectTest($t_numProjectID[0])) && p('1;2') && e('822;823'); //测试未开始项目相关的库id -r($doc->getLibIdListByProjectTest($t_numProjectID[1])) && p('6;7') && e('827;828'); //测试进行中项目相关的库id -r($doc->getLibIdListByProjectTest($t_numProjectID[2])) && p('88;89') && e('87;97'); //测试已暂停项目相关的库id -r($doc->getLibIdListByProjectTest($t_numProjectID[3])) && p('88;89') && e('88;98'); //测试已关闭项目相关的库id \ No newline at end of file