* code for bug #22026.

This commit is contained in:
wangyidong
2022-04-27 11:53:27 +08:00
parent 2d82ad3e79
commit 7b1fc7ee04
+2
View File
@@ -2807,6 +2807,7 @@ class storyModel extends model
->where($storyQuery)
->andWhere('t1.project')->eq((int)$executionID)
->andWhere('t2.deleted')->eq(0)
->andWhere('t4.deleted')->eq(0)
->andWhere('t2.type')->eq($storyType)
->beginIF($excludeStories)->andWhere('t2.id')->notIN($excludeStories)->fi()
->orderBy($orderBy)
@@ -2862,6 +2863,7 @@ class storyModel extends model
->beginIF($this->session->storyBrowseType and strpos('changed|', $this->session->storyBrowseType) !== false)->andWhere('t2.status')->in(array_keys($unclosedStatus))->fi()
->beginIF($modules)->andWhere('t2.module')->in($modules)->fi()
->andWhere('t2.deleted')->eq(0)
->andWhere('t4.deleted')->eq(0)
->orderBy($orderBy)
->page($pager, 't2.id')
->fetchAll('id');