From cf9b11d829db1749bede586ad2c326eaef524ed5 Mon Sep 17 00:00:00 2001 From: wangyidong Date: Wed, 3 Sep 2025 12:11:58 +0800 Subject: [PATCH 1/2] * [refac bug #65023] Adjust for show file when no case step. --- lib/zin/wg/filelist/v1.php | 2 +- module/testtask/model.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/zin/wg/filelist/v1.php b/lib/zin/wg/filelist/v1.php index 0e5a9a0a6c..d0822fe153 100644 --- a/lib/zin/wg/filelist/v1.php +++ b/lib/zin/wg/filelist/v1.php @@ -44,7 +44,7 @@ class fileList extends wg foreach($files as $file) { - if($file->extra != $extra) continue; + if($extra && $file->extra != $extra) continue; $fileItemView = html($app->loadTarget('file')->printFile($file, $method, $showDelete, $showEdit, $object)); $fileListView->add($fileItemView); diff --git a/module/testtask/model.php b/module/testtask/model.php index df9fe05762..2abe12e392 100755 --- a/module/testtask/model.php +++ b/module/testtask/model.php @@ -1644,7 +1644,7 @@ class testtaskModel extends model { $resultFiles[$file->objectID][$file->id] = $file; } - elseif($file->objectType == 'stepResult' && $file->extra !== '') + elseif($file->objectType == 'stepResult') { $stepFiles[$file->objectID][(int)$file->extra][$file->id] = $file; } From cbcfa7a7cfa3ebfd087f8ea1e930f3f431c24da9 Mon Sep 17 00:00:00 2001 From: wangyidong Date: Wed, 3 Sep 2025 13:11:05 +0800 Subject: [PATCH 2/2] * [refac bug #65023] Adjust unit test. --- module/testtask/test/model/getresultsfiles.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/module/testtask/test/model/getresultsfiles.php b/module/testtask/test/model/getresultsfiles.php index f4c2b92ddc..fd7d0f9f64 100644 --- a/module/testtask/test/model/getresultsfiles.php +++ b/module/testtask/test/model/getresultsfiles.php @@ -22,7 +22,7 @@ cid=1 - 属性step @4: 4 6: 6 - 测试获取结果 7 8 9 的文件 - 属性result @9: 9 - - 属性step @~~ + - 属性step @8: 8 - 测试获取结果 10 11 12 的文件 - 属性result @11: 11 - 属性step @10: 10 12: 12 @@ -55,7 +55,7 @@ $testtask = new testtaskTest(); r($testtask->getResultsFilesTest($resultIdList[0])) && p('result,step') && e('1: 1 3: 3,2: 2'); // 测试获取结果 1 2 3 的文件 r($testtask->getResultsFilesTest($resultIdList[1])) && p('result,step') && e('5: 5,4: 4 6: 6'); // 测试获取结果 4 5 6 的文件 -r($testtask->getResultsFilesTest($resultIdList[2])) && p('result,step') && e('9: 9,~~'); // 测试获取结果 7 8 9 的文件 +r($testtask->getResultsFilesTest($resultIdList[2])) && p('result,step') && e('9: 9,8: 8'); // 测试获取结果 7 8 9 的文件 r($testtask->getResultsFilesTest($resultIdList[3])) && p('result,step') && e('11: 11,10: 10 12: 12'); // 测试获取结果 10 11 12 的文件 r($testtask->getResultsFilesTest($resultIdList[4])) && p('result,step') && e('13: 13 15: 15,~~'); // 测试获取结果 13 14 15 的文件 r($testtask->getResultsFilesTest($resultIdList[5])) && p('result,step') && e('17: 17,16: 16 18: 18'); // 测试获取结果 16 17 18 的文件