From ac9d06cf7cbd0bc05269e6d297858cab40619d67 Mon Sep 17 00:00:00 2001
From: songchenxuan <songchenxuan@easycorp.ltd>
Date: Fri, 10 Dec 2021 11:05:11 +0800
Subject: [PATCH] *Finish task #45539.

---
 module/execution/model.php | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/module/execution/model.php b/module/execution/model.php
index 2fb5f3ae08..3916b1103c 100644
--- a/module/execution/model.php
+++ b/module/execution/model.php
@@ -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;