Merge branch 'sprint/app10'

2021-11-25 10:25:05 +08:00
parent a83f2d8ce9 57c6ae78a8
commit 9a80f35962
25 changed files with 410 additions and 154 deletions
@@ -317,9 +317,8 @@ class testcaseModel extends model
        {
            return $this->dao->select('distinct t1.*, t2.*')->from(TABLE_PROJECTCASE)->alias('t1')
                ->leftJoin(TABLE_CASE)->alias('t2')->on('t1.case=t2.id')
-                ->leftJoin(TABLE_STORY)->alias('t3')->on('t1.story = t3.id')
+                ->leftJoin(TABLE_STORY)->alias('t3')->on('t2.story = t3.id')
                ->where('t1.project')->eq((int)$executionID)
-                ->beginIF($browseType != 'all')->andWhere('t2.status')->eq($browseType)->fi()
                ->andWhere('t2.deleted')->eq('0')
                ->andWhere('t3.version > t2.storyVersion')
                ->andWhere("t3.status")->eq('active')