Merge branch 'sprint/176_songchenxuan_45537' into 'master'

*Finish task #45337. See merge request easycorp/zentaopms!871
2021-12-10 02:45:06 +00:00
parent c1518b36a0 95d51fdc09
commit c5bce17ef3
1 changed files with 1 additions and 0 deletions
@@ -582,6 +582,7 @@ class testcaseModel extends model
            ->where('t1.assignedTo')->eq($account)
            ->andWhere('t3.deleted')->eq(0)
            ->andWhere('t2.deleted')->eq(0)
+            ->andWhere('t3.status')->ne('done')
            ->beginIF($auto != 'skip' and $auto != 'unit')->andWhere('t2.auto')->ne('unit')->fi()
            ->beginIF($auto == 'unit')->andWhere('t2.auto')->eq('unit')->fi()
            ->orderBy($orderBy)->page($pager)->fetchAll('id');