Merge branch 'sprint/203_mayue_bug#23410' into 'master'

* Fix bug #23410.

See merge request easycorp/zentaopms!3897
This commit is contained in:
孙广明
2022-06-14 05:35:39 +00:00
+2 -1
View File
@@ -1499,6 +1499,7 @@ class kanbanModel extends model
if(empty($column->cards)) continue;
foreach($cardList as $card)
{
if($card->assignedTo == '') $card->assignedTo = 0;
if(strpos($column->cards, ",$card->id,") !== false) $cardGroup[$column->columnType][$card->id] = $card;
}
}
@@ -1551,7 +1552,7 @@ class kanbanModel extends model
$cardData = array();
if(in_array($groupBy, array('module', 'story', 'pri', 'severity')) and (int)$object->$groupBy !== $laneID) continue;
if(in_array($groupBy, array('assignedTo', 'type', 'category', 'source')) and $object->$groupBy != $laneID) continue;
if(in_array($groupBy, array('assignedTo', 'type', 'category', 'source')) and $object->$groupBy !== $laneID) continue;
$cardData['id'] = $object->id;
$cardData['order'] = $cardOrder;