diff --git a/module/design/model.php b/module/design/model.php index 2de39e8a01..ccb16c257c 100755 --- a/module/design/model.php +++ b/module/design/model.php @@ -316,18 +316,22 @@ class designModel extends model } /** + * 获取设计关联的代码提交。 * Get commit. * - * @param int $designID - * @param int $pager + * @param int $designID + * @param object $pager * @access public - * @return object + * @return object|bool */ - public function getCommit($designID = 0, $pager = null) + public function getCommit(int $designID = 0, object $pager = null): object|bool { $design = $this->dao->select('*')->from(TABLE_DESIGN)->where('id')->eq($designID)->fetch(); + if(!$design) return false; - $design->commit = $this->dao->select('*')->from(TABLE_REPOHISTORY)->where('id')->in($design->commit)->page($pager)->fetchAll('id'); + $design->project = (int)$design->project; + $design->product = (int)$design->product; + $design->commit = $this->dao->select('*')->from(TABLE_REPOHISTORY)->where('id')->in($design->commit)->page($pager)->fetchAll('id'); return $design; } diff --git a/module/design/test/model/getcommit.php.bak b/module/design/test/model/getcommit.php.bak deleted file mode 100644 index 55af465786..0000000000 --- a/module/design/test/model/getcommit.php.bak +++ /dev/null @@ -1,17 +0,0 @@ -#!/usr/bin/env php -getCommit(); -cid=1 -pid=1 - -*/ - -$design = new designTest(); - -r($design->getCommitTest()) && p() && e(); \ No newline at end of file