From 4a19f97d4a3c9ab49c47684c001e1bf0cfc5f31b Mon Sep 17 00:00:00 2001 From: sunguangming Date: Mon, 27 Nov 2023 14:58:12 +0800 Subject: [PATCH] * Compatible DM DB. --- module/block/control.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/module/block/control.php b/module/block/control.php index 943a9e19dc..a0feee4ffd 100755 --- a/module/block/control.php +++ b/module/block/control.php @@ -1008,15 +1008,14 @@ class block extends control ->where('project')->in(array_keys($projects)) ->andWhere('deleted')->eq('0') ->andWhere('type')->in('sprint,stage,kanban') - ->groupBy('project') - ->orderBy('id_desc') + ->orderBy('id_asc') ->fetchAll('project'); foreach($projects as $projectID => $project) { if(in_array($project->model, array('scrum', 'kanban', 'agileplus'))) { - $project->execution = zget($projectExecutions, $projectID, array()); + $project->execution = zget($projectExecutions, $projectID, null); } elseif(in_array($project->model, array('waterfall', 'waterfallplus', 'ipd'))) {