Merge branch 'release/21.7.1' into feature/doctemplate

This commit is contained in:
xieqiyu
2025-05-19 17:10:17 +08:00
238 changed files with 11017 additions and 1167 deletions
+2 -1
View File
@@ -2054,8 +2054,9 @@ class testcaseModel extends model
{
$browseType = $this->session->caseBrowseType && $this->session->caseBrowseType != 'bysearch' ? $this->session->caseBrowseType : 'all';
$stmt = $this->dao->select('t1.*')->from(TABLE_CASE)->alias('t1');
$stmt = $this->dao->select('t1.*,t3.title as storyTitle')->from(TABLE_CASE)->alias('t1');
if($this->app->tab == 'project') $stmt = $stmt->leftJoin(TABLE_PROJECTCASE)->alias('t2')->on('t1.id=t2.case');
$stmt->leftJoin(TABLE_STORY)->alias('t3')->on('t1.story = t3.id');
$caseList = $stmt->where('t1.deleted')->eq('0')
->andWhere('t1.scene')->ne(0)