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

* testcaseModel: get scene from TABLE_SCENE instead of from VIEW_SCENECASE.

Browse Source
This commit is contained in:
liugang
2023-08-09 10:14:53 +08:00
parent 03aa827285
commit a050ec31c3
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/testcase/model.php
+4 -5
View File
@@ -3182,17 +3182,16 @@ class testcaseModel extends model
$startScenePath = '';
if($startScene > 0)
{
$startScene = $this->dao->findById((int)$startScene)->from(VIEW_SCENECASE)->fetch();
$startScene = $this->getSceneByID($startScene);
if($startScene) $startScenePath = $startScene->path . '%';
}
return $this->dao->select('*')->from(VIEW_SCENECASE)
return $this->dao->select('*')->from(TABLE_SCENE)
->where('deleted')->eq(0)
->beginIF($rootID)->andWhere('product')->eq((int)$rootID)->fi()
->beginIF(intval($moduleID) > 0)->andWhere('module')->eq((int)$moduleID)->fi()
->beginIF($startScenePath)->andWhere('path')->like($startScenePath)->fi()
->beginIF($branch !== 'all' and $branch !== '' and $branch !== false)->andWhere('branch')->eq((int)$branch)->fi()
->andWhere('isCase')->eq(2)
->orderBy('grade desc, sort')
->get();
}
@@ -3391,10 +3390,10 @@ class testcaseModel extends model
{
if($sceneID == 0) return array();
$scene = $this->dao->findById((int)$sceneID)->from(VIEW_SCENECASE)->fetch();
$scene = $this->getSceneByID($sceneID);
if(empty($scene)) return array();
return $this->dao->select('id')->from(VIEW_SCENECASE)
return $this->dao->select('id')->from(TABLE_SCENE)
->where('path')->like($scene->path . '%')
->andWhere('deleted')->eq(0)
->fetchPairs();