From e21db62811227ea4f9bba1453263af37458c589f Mon Sep 17 00:00:00 2001 From: sunguangming Date: Thu, 17 Jul 2025 08:13:35 +0000 Subject: [PATCH] * [misc] add needconfirm condition. --- module/testcase/control.php | 2 +- module/testcase/model.php | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/module/testcase/control.php b/module/testcase/control.php index c5d24404ab..e1a3860af3 100644 --- a/module/testcase/control.php +++ b/module/testcase/control.php @@ -210,7 +210,7 @@ class testcase extends control */ public function groupCase(int $productID = 0, string $branch = '', string $groupBy = 'story', int $objectID = 0, string $caseType = '', string $browseType = 'all') { - if($browseType) $this->session->set('caseBrowseType', $browseType, $this->app->tab); + if($browseType) $this->session->set('caseBrowseType', $browseType); $this->testcaseZen->checkProducts(); // 如果不存在产品,则跳转到产品创建页面。 /* 设置SESSION和COOKIE,获取产品信息。 */ diff --git a/module/testcase/model.php b/module/testcase/model.php index 457f49c37f..a88d1193c9 100755 --- a/module/testcase/model.php +++ b/module/testcase/model.php @@ -108,6 +108,7 @@ class testcaseModel extends model ->beginIF($branch !== 'all')->andWhere('t1.branch')->eq($branch)->fi() ->beginIF($moduleIdList)->andWhere('t1.module')->in($moduleIdList)->fi() ->beginIF($browseType == 'wait')->andWhere('t1.status')->eq($browseType)->fi() + ->beginIF($browseType == 'needconfirm')->andWhere('t2.version > t1.version')->fi() ->beginIF($auto == 'auto' || $auto == 'unit')->andWhere('t1.auto')->eq($auto)->fi() ->beginIF($auto != 'auto' && $auto != 'unit')->andWhere('t1.auto')->ne('unit')->fi() ->beginIF($caseType)->andWhere('t1.type')->eq($caseType)->fi()