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

* Fix bug #17994.

Browse Source
This commit is contained in:
zhouxudong
2022-04-12 16:50:56 +08:00
parent d60ce0159c
commit 8baef621d2
13 changed files with 45 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/testtask/model.php
+2 -2
View File
@@ -1040,17 +1040,17 @@ class testtaskModel extends model
* @access public
* @return array
*/
public function getUserTestTaskPairs($account, $limit = 0, $status = 'all', $skipProductIDList = array(), $skipExecutionIDList = array())
public function getUserTestTaskPairs($account, $limit = 0, $status = 'all', $skipProductIDList = array(), $skipExecutionIDList = array(), $appendTestTaskID = '')
{
$stmt = $this->dao->select('t1.id, t1.name, t2.name as execution')
->from(TABLE_TESTTASK)->alias('t1')
->leftjoin(TABLE_EXTENSION)->alias('t2')->on('t1.execution = t2.id')
->where('t1.owner')->eq($account)
->andWhere('t1.status')->ne('done')
->andWhere('t1.deleted')->eq(0)
->beginIF($status != 'all')->andWhere('t1.status')->in($status)->fi()
->beginIF(!empty($skipProductIDList))->andWhere('t1.product')->notin($skipProductIDList)->fi()
->beginIF(!empty($skipExecutionIDList))->andWhere('t1.execution')->notin($skipExecutionIDList)->fi()
->beginIF(!empty($appendTestTaskID))->orWhere('t1.id')->in($appendTestTaskID)->fi()
->beginIF($limit)->limit($limit)->fi()
->query();