Merge branch 'master' of https://github.com/easysoft/zentaopms

2020-12-01 15:20:34 +08:00
parent e9834ba5a5 916a9eef50
commit 7619b32dee
5 changed files with 9 additions and 9 deletions
@@ -842,7 +842,7 @@ class programModel extends model
        $this->app->loadClass('pager', $static = true);
        foreach($projects as $projectID => $project)
        {
-            $orderBy = $project->model == 'waterfall' ? 'path_asc,id_asc' : 'id_desc';
+            $orderBy = $project->model == 'waterfall' ? 'id_asc,path_asc' : 'id_desc';
            $pager   = $project->model == 'waterfall' ? null : new pager(0, 1, 1);
            $project->executions = $this->project->getExecutionStats($projectID, 'undone', 0, 0, 30, $orderBy, $pager);
            $project->teamCount  = isset($teams[$projectID]) ? $teams[$projectID]->count : 0;