Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'

* Fix bug #30022

See merge request easycorp/zentaopms!6273
This commit is contained in:
孙广明
2022-11-21 05:48:10 +00:00
+1
View File
@@ -823,6 +823,7 @@ class reportModel extends model
/* Get changed executions in this year. */
$executions = $this->dao->select('id,name')->from(TABLE_EXECUTION)->where('deleted')->eq(0)
->andwhere('type')->eq('sprint')
->andwhere('multiple')->eq('1')
->andWhere('LEFT(begin, 4)', true)->eq($year)
->orWhere('LEFT(end, 4)')->eq($year)
->markRight(1)