From 80d0d16175a78a06d35da3523c2e533cc60b8647 Mon Sep 17 00:00:00 2001 From: liugang Date: Tue, 15 Aug 2023 16:38:02 +0800 Subject: [PATCH] * testcaseModel: fix error of batch scene of cases. --- module/testcase/model.php | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/module/testcase/model.php b/module/testcase/model.php index 020e8d596c..25d6a7e7cf 100644 --- a/module/testcase/model.php +++ b/module/testcase/model.php @@ -3019,20 +3019,21 @@ class testcaseModel extends model */ public function batchChangeScene($caseIDList, $sceneID) { - $caseIDList = $this->filterIdList($caseIDList); + $caseIDList = array_filter($caseIDList); if(!$caseIDList) return false; - $oldCases = $this->getByList($caseIDList, "scene != {$sceneID}"); - $this->dao->update(TABLE_CASE)->set('scene')->eq($sceneID)->where('scene')->ne($sceneID)->andWhere('id')->in($caseIDList)->exec(); - if(dao::isError()) return false; - - $this->loadModel('action'); + $oldCases = $this->getByList($caseIDList, "scene != '{$sceneID}'"); $case = new stdclass(); $case->scene = $sceneID; $case->lastEditedBy = $this->app->user->account; $case->lastEditedDate = helper::now(); + $this->dao->update(TABLE_CASE)->data($case)->where('scene')->ne($sceneID)->andWhere('id')->in($caseIDList)->exec(); + if(dao::isError()) return false; + + $this->loadModel('action'); + foreach($oldCases as $oldCase) { $changes = common::createChanges($oldCase, $case);