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

* testtaskModel: refactor the getLinkableCases method.

Browse Source
This commit is contained in:
liugang
2023-10-13 09:27:49 +08:00
parent ce12d919b4
commit f0dbbeac78
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/testtask/model.php
+2 -2
View File
@@ -343,7 +343,7 @@ class testtaskModel extends model
* @access public
* @return array
*/
public function getLinkableCases(int $productID, object $task, string $type, int $param, object $pager): array
public function getLinkableCases(int $productID, object $task, string $type = 'all', int $param = 0, object $pager = null): array
{
if($this->session->testcaseQuery == false) $this->session->set('testcaseQuery', ' 1 = 1');
$query = $this->session->testcaseQuery;
@@ -379,9 +379,9 @@ class testtaskModel extends model
->where('deleted')->eq('0')
->andWhere('status')->ne('wait')
->andWhere('type')->ne('unit')
->beginIF($task->branch !== '')->andWhere('branch')->in("0,{$task->branch}")->fi()
->beginIF($query)->andWhere($query)->fi()
->beginIF(!empty($linkedCases))->andWhere('id')->notIN($linkedCases)->fi()
->beginIF($task->branch !== '')->andWhere('branch')->in("0,{$task->branch}")->fi()
->orderBy('id desc')
->page($pager)
->fetchAll();