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

* fix bug #29534.

Browse Source
This commit is contained in:
wangyidong
2022-11-10 12:09:14 +08:00
parent 2e6e289f1a
commit e2cf4aa1be
4 changed files with 11 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/testtask/model.php
+4 -3
View File
@@ -194,14 +194,15 @@ class testtaskModel extends model
* @access public
* @return array
*/
public function getExecutionTasks($executionID, $orderBy = 'id_desc', $pager = null)
public function getExecutionTasks($executionID, $objectType = 'execution', $orderBy = 'id_desc', $pager = null)
{
return $this->dao->select('t1.*, t2.name AS buildName')
->from(TABLE_TESTTASK)->alias('t1')
->leftJoin(TABLE_BUILD)->alias('t2')->on('t1.build = t2.id')
->where('t1.execution')->eq((int)$executionID)
->where('t1.deleted')->eq(0)
->beginIF($objectType == 'execution')->andWhere('t1.execution')->eq((int)$executionID)->fi()
->beginIF($objectType == 'project')->andWhere('t1.project')->eq((int)$executionID)->fi()
->andWhere('t1.auto')->ne('unit')
->andWhere('t1.deleted')->eq(0)
->orderBy($orderBy)
->page($pager)
->fetchAll('id');