From d8bd6cf2d8b6b17450d041de40174e8715c0c666 Mon Sep 17 00:00:00 2001 From: liugang Date: Tue, 12 Sep 2023 17:04:13 +0800 Subject: [PATCH] * testtaskModel: refactor the unlinkCase method. --- module/testtask/model.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/module/testtask/model.php b/module/testtask/model.php index 88786685cb..f006cc99be 100755 --- a/module/testtask/model.php +++ b/module/testtask/model.php @@ -951,9 +951,11 @@ class testtaskModel extends model ->leftJoin(TABLE_CASE)->alias('t2')->on('t1.case=t2.id') ->where('t1.id')->eq($runID) ->fetch(); - $linkedProjects = $this->dao->select('project')->from(TABLE_PROJECTSTORY)->where('story')->eq($run->story)->fetchPairs(); + if(!$run) return false; + + $linkedProjects = $run->story ? $this->dao->select('project')->from(TABLE_PROJECTSTORY)->where('story')->eq($run->story)->fetchPairs() : array(); + if($linkedProjects) $this->dao->delete()->from(TABLE_PROJECTCASE)->where('`case`')->eq($run->case)->andWhere('project')->notin($linkedProjects)->exec(); - $this->dao->delete()->from(TABLE_PROJECTCASE)->where('`case`')->eq($run->case)->andWhere('project')->notin($linkedProjects)->exec(); $this->dao->delete()->from(TABLE_TESTRUN)->where('id')->eq($runID)->exec(); $this->loadModel('action')->create('case' ,$run->case, 'unlinkedfromtesttask', '', $run->task);