Merge branch 'sprint/176_songchenxuan_45535' into 'master'

*Finish task #45535. See merge request easycorp/zentaopms!872
2021-12-10 06:04:55 +00:00
parent 5ee11088b8 ac9d06cf7c
commit d148ae7cf4
1 changed files with 1 additions and 1 deletions
@@ -2560,7 +2560,7 @@ class executionModel extends model
            ->andWhere('(project')->eq($projectID)
            ->orWhere('id')->eq($projectID)
            ->markRight(1)
-            ->orderBy('project_asc')
+            ->orderBy('type_asc,openedDate_desc')
            ->fetchPairs();

        return $objectPairs;