From 74b53af5b5c28a24309cae434e4c3b8fc9bda5bc Mon Sep 17 00:00:00 2001 From: sunguangming Date: Fri, 17 Oct 2025 01:17:44 +0000 Subject: [PATCH] * [bug#66208,#66201,done,0.5h] fix bug. --- lib/zin/wg/navbar/v1.php | 2 +- module/testtask/model.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/zin/wg/navbar/v1.php b/lib/zin/wg/navbar/v1.php index 8318fe8e4d..aa29b3a90f 100644 --- a/lib/zin/wg/navbar/v1.php +++ b/lib/zin/wg/navbar/v1.php @@ -36,7 +36,7 @@ class navbar extends wg $object = $app->dbh->query('SELECT project,`type` FROM ' . TABLE_EXECUTION . " WHERE `id` = '$executionID'")->fetch(); if(empty($object)) return; - $project = $app->dbh->query('SELECT id,model FROM ' . TABLE_PROJECT . " WHERE `id` = '{$object->project}'")->fetch(); + $project = $app->dbh->query('SELECT id,`model` FROM ' . TABLE_PROJECT . " WHERE `id` = '{$object->project}'")->fetch(); $executionPairs = array(); $userCondition = !$app->user->admin ? " AND `id` " . helper::dbIN($app->user->view->sprints) : ''; $orderBy = in_array($project->model, array('waterfall', 'waterfallplus')) ? 'ORDER BY `order` ASC' : 'ORDER BY `id` DESC'; diff --git a/module/testtask/model.php b/module/testtask/model.php index ea82ba169f..069ca260cd 100755 --- a/module/testtask/model.php +++ b/module/testtask/model.php @@ -1008,7 +1008,7 @@ class testtaskModel extends model return $this->dao->select("t2.*, t1.*, t2.version AS caseVersion, COALESCE(t3.title, '') AS storyTitle, t2.status AS caseStatus, IF(t4.title IS NULL, t2.title, t4.title) AS title")->from(TABLE_TESTRUN)->alias('t1') ->leftJoin(TABLE_CASE)->alias('t2')->on('t1.case = t2.id') ->leftJoin(TABLE_STORY)->alias('t3')->on('t2.story = t3.id') - ->leftJoin(TABLE_CASESPEC)->alias('t4')->on('t1.case = t4.case AND t1.version = t4.version') + ->leftJoin(TABLE_CASESPEC)->alias('t4')->on('t1.`case` = t4.`case` AND t1.version = t4.version') ->where('t1.task')->eq($taskID) ->andWhere('t2.deleted')->eq('0') ->beginIF($modules)->andWhere('t2.module')->in($modules)->fi()