*Finish task #45539.

2021-12-10 11:05:11 +08:00
parent 66c2768b6a
commit ac9d06cf7c
1 changed files with 2 additions and 5 deletions
@@ -2555,14 +2555,11 @@ class executionModel extends model
        if(empty($projectID) and $this->config->systemMode == 'new') return array();

        $objectPairs = $this->dao->select('id,name')->from(TABLE_PROJECT)
-            ->where('deleted')->eq(0)
-            ->andWhere('id')->eq($projectID)
-            ->fetchPairs();
-        $objectPairs += $this->dao->select('id,name')->from(TABLE_PROJECT)
            ->where('deleted')->eq(0)
            ->andWhere('(project')->eq($projectID)
+            ->orWhere('id')->eq($projectID)
            ->markRight(1)
-            ->orderBy('openedDate_desc')
+            ->orderBy('type_asc,openedDate_desc')
            ->fetchPairs();

        return $objectPairs;