Merge branch 'sprint/204_liumengyi_23648' into 'master'

* Fix bug #23648.

See merge request easycorp/zentaopms!3912
This commit is contained in:
王怡栋
2022-06-14 07:26:14 +00:00
+1 -1
View File
@@ -3846,7 +3846,7 @@ class execution extends control
if($from == 'execution') $this->session->set('taskSearchValue', $searchValue);
if($from == 'RD') $this->session->set('rdSearchValue', $searchValue);
if($lastEditedTime > $enterTime or $groupBy != 'default' or !empty($searchValue))
if(strtotime($lastEditedTime) < 0 or $lastEditedTime > $enterTime or $groupBy != 'default' or !empty($searchValue))
{
$kanbanGroup = $from == 'execution' ? $this->loadModel('kanban')->getExecutionKanban($executionID, $browseType, $groupBy, $searchValue) : $this->loadModel('kanban')->getRDKanban($executionID, $browseType, 'id_asc', 0, $groupBy, $searchValue);
return print(json_encode($kanbanGroup));