From abd24e169b80245a54a1ea4fed96bf5be9e20276 Mon Sep 17 00:00:00 2001 From: hufangzhou Date: Wed, 24 May 2023 13:04:53 +0800 Subject: [PATCH] * Finish task #93584. --- module/testtask/model.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/module/testtask/model.php b/module/testtask/model.php index e509d209f7..ffccd16625 100755 --- a/module/testtask/model.php +++ b/module/testtask/model.php @@ -82,10 +82,9 @@ class testtaskModel extends model ->leftJoin(TABLE_EXECUTION)->alias('t3')->on('t1.execution = t3.id') ->leftJoin(TABLE_BUILD)->alias('t4')->on('t1.build = t4.id') ->leftJoin(TABLE_PROJECT)->alias('t5')->on('t3.project = t5.id') - ->where('t1.deleted')->eq(0) ->andWhere('t1.auto')->ne('unit') - ->beginIF(!$this->app->user->admin)->andWhere('t3.id')->in("0,{$this->app->user->view->sprints}")->fi() + ->beginIF(!$this->app->user->admin)->andWhere('t1.execution')->in("0,{$this->app->user->view->sprints}")->fi() ->beginIF($scopeAndStatus[0] == 'local')->andWhere('t1.product')->eq((int)$productID)->fi() ->beginIF($scopeAndStatus[0] == 'all')->andWhere('t1.product')->in($products)->fi() ->beginIF(strtolower($scopeAndStatus[1]) == 'totalstatus')->andWhere('t1.status')->in('blocked,doing,wait,done')->fi()