* Fix bug#21208.

This commit is contained in:
tanghucheng
2022-03-28 13:50:48 +08:00
parent dd13984197
commit ab4053b372

View File

@@ -1734,13 +1734,12 @@ class block extends control
->where('deleted')->eq(0)
->andWhere('assignedTo')->eq($this->app->user->account)->fi()
->beginIF($objectType == 'story')->andWhere('type')->eq('story')->fi()
->beginIF($objectType == 'todo')->andWhere('cycle')->eq(0)->fi()
->beginIF($objectType == 'todo')->andWhere('status')->eq('wait')->fi()
->beginIF($objectType == 'todo')->andWhere('cycle')->eq(0)->andWhere('status')->eq('wait')->andWhere('vision')->eq($this->config->vision)->fi()
->beginIF($objectType != 'todo')->andWhere('status')->ne('closed')->fi()
->orderBy($orderBy)
->beginIF($limitCount)->limit($limitCount)->fi()
->fetchAll();
if($objectType == 'todo')
{
$this->app->loadClass('date');