diff --git a/module/common/lang/menu.php b/module/common/lang/menu.php
index 3eea6622e3..ac8efa4792 100644
--- a/module/common/lang/menu.php
+++ b/module/common/lang/menu.php
@@ -198,10 +198,10 @@ $lang->scrum->menuOrder[48] = 'dynamic';
 $lang->scrum->menuOrder[50] = 'settings';
 
 $lang->scrum->menu->qa['subMenu'] = new stdclass();
+//$lang->scrum->menu->qa['subMenu']->index      = array('link' => "$lang->dashboard|project|qa|projectID=%s");
 $lang->scrum->menu->qa['subMenu']->bug        = array('link' => "{$lang->bug->common}|project|bug|projectID=%s", 'subModule' => 'bug');
 $lang->scrum->menu->qa['subMenu']->testcase   = array('link' => "{$lang->testcase->shortCommon}|project|testcase|projectID=%s", 'subModule' => 'testsuite,testcase,caselib,tree');
 $lang->scrum->menu->qa['subMenu']->testtask   = array('link' => "{$lang->testtask->common}|project|testtask|projectID=%s", 'subModule' => 'testtask', 'class' => 'dropdown dropdown-hover');
-$lang->scrum->menu->qa['subMenu']->testtask   = array('link' => "{$lang->testtask->common}|project|testtask|projectID=%s", 'subModule' => 'testtask', 'class' => 'dropdown dropdown-hover');
 $lang->scrum->menu->qa['subMenu']->testreport = array('link' => "{$lang->testreport->common}|project|testreport|projectID=%s", 'subModule' => 'testreport');
 
 $lang->scrum->menu->settings['subMenu'] = new stdclass();
@@ -223,7 +223,7 @@ $lang->execution->menu->kanban   = array('link' => "$lang->kanban|execution|kanb
 $lang->execution->menu->burn     = array('link' => "$lang->burn|execution|burn|executionID=%s");
 $lang->execution->menu->view     = array('link' => "$lang->view|execution|grouptask|executionID=%s", 'alias' => 'grouptask,tree', 'class' => 'dropdown dropdown-hover');
 $lang->execution->menu->story    = array('link' => "$lang->SRCommon|execution|story|executionID=%s", 'subModule' => 'story', 'alias' => 'batchcreate,linkstory,storykanban');
-$lang->execution->menu->qa       = array('link' => "{$lang->qa->common}|execution|qa|executionID=%s", 'subModule' => 'bug,testcase,testtask,testreport', 'alias' => 'qa,bug,testcase,testtask,testreport');
+$lang->execution->menu->qa       = array('link' => "{$lang->qa->common}|execution|bug|executionID=%s", 'subModule' => 'bug,testcase,testtask,testreport', 'alias' => 'qa,bug,testcase,testtask,testreport');
 $lang->execution->menu->devops   = array('link' => "{$lang->repo->common}|repo|browse|repoID=0&branchID=&objectID=%s", 'subModule' => 'repo');
 $lang->execution->menu->doc      = array('link' => "{$lang->doc->common}|doc|objectLibs|type=execution&objectID=%s", 'subModule' => 'doc');
 $lang->execution->menu->build    = array('link' => "{$lang->build->common}|execution|build|executionID=%s", 'subModule' => 'build');
@@ -250,7 +250,7 @@ $lang->execution->menu->view['subMenu']->groupTask = "$lang->groupView|execution
 $lang->execution->menu->view['subMenu']->tree      = "$lang->treeView|execution|tree|executionID=%s";
 
 $lang->execution->menu->qa['subMenu'] = new stdclass();
-$lang->execution->menu->qa['subMenu']->qa         = array('link' => "$lang->dashboard|execution|qa|executionID=%s");
+//$lang->execution->menu->qa['subMenu']->qa         = array('link' => "$lang->dashboard|execution|qa|executionID=%s");
 $lang->execution->menu->qa['subMenu']->bug        = array('link' => "{$lang->bug->common}|execution|bug|executionID=%s", 'subModule' => 'bug');
 $lang->execution->menu->qa['subMenu']->testcase   = array('link' => "{$lang->testcase->shortCommon}|execution|testcase|executionID=%s", 'alias' => 'create');
 $lang->execution->menu->qa['subMenu']->testtask   = array('link' => "{$lang->testtask->common}|execution|testtask|executionID=%s", 'subModule' => 'testtask');
diff --git a/module/execution/model.php b/module/execution/model.php
index cd06c413c4..acbc4c350e 100644
--- a/module/execution/model.php
+++ b/module/execution/model.php
@@ -2235,7 +2235,8 @@ class executionModel extends model
             ->leftJoin(TABLE_EXECUTION)->alias('t2')->on('t1.root = t2.id')
             ->where('t1.account')->eq($account)
             ->andWhere('t1.root')->ne($currentExecution)
-            ->andWhere('t1.type')->eq($execution->type)
+            ->andWhere('t1.type')->eq('execution')
+            ->andWhere('t2.project')->eq($execution->project)
             ->andWhere('t2.deleted')->eq('0')
             ->groupBy('t1.root')
             ->orderBy('t1.root DESC')
diff --git a/module/my/view/project.html.php b/module/my/view/project.html.php
index 1ceec409b1..911af9938f 100644
--- a/module/my/view/project.html.php
+++ b/module/my/view/project.html.php
@@ -63,7 +63,7 @@
           <td class='c-status'><span class="status-project status-<?php echo $project->status?>"><?php echo zget($lang->project->statusList, $project->status, '');?></span></td>
           <?php endif;?>
           <td class='text-left'><?php echo $project->begin;?></td>
-          <td class='text-left'><?php echo $project->end == '0000-00-00' ? '' : $project->end;?></td>
+          <td class='text-left'><?php echo $project->end == LONG_TIME ? $this->lang->project->longTime : $project->end;?></td>
           <?php $projectBudget = in_array($this->app->getClientLang(), ['zh-cn','zh-tw']) && $project->budget >= 10000 ? number_format($project->budget / 10000, 1) . $this->lang->project->tenThousand : number_format((float)$project->budget, 1);?>
           <td class='text-right'><?php echo $project->budget != 0 ? zget($lang->project->currencySymbol, $project->budgetUnit) . ' ' . $projectBudget : $lang->project->future;?></td>
           <td>
diff --git a/module/user/control.php b/module/user/control.php
index e6b3bf0380..8085bb333f 100644
--- a/module/user/control.php
+++ b/module/user/control.php
@@ -80,7 +80,7 @@ class user extends control
         $users   = $this->loadModel('user')->getPairs('useid|noletter|noclosed');
 
         /* set menus. */
-        $this->view->userList = $this->user->setUserList($users, $userID);
+        $this->view->userList = $this->user->setUserList($this->user->getPairs('noempty|noclosed|nodeleted|useid|noletter'), $userID);
 
         $this->view->title      = $this->lang->user->common . $this->lang->colon . $this->lang->user->todo;
         $this->view->position[] = $this->lang->user->todo;
@@ -135,7 +135,7 @@ class user extends control
         $this->view->type       = $type;
         $this->view->user       = $user;
         $this->view->pager      = $pager;
-        $this->view->userList   = $this->user->setUserList($users, $userID);
+        $this->view->userList   = $this->user->setUserList($this->user->getPairs('noempty|noclosed|nodeleted|useid|noletter'), $userID);
 
         $this->display();
     }
@@ -165,7 +165,7 @@ class user extends control
         $users   = $this->loadModel('dept')->getDeptUserPairs($user->dept, 'useid');
 
         /* Set the menu. */
-        $this->view->userList = $this->user->setUserList($users, $userID);
+        $this->view->userList = $this->user->setUserList($this->user->getPairs('noempty|noclosed|nodeleted|useid|noletter'), $userID);
 
         /* Assign. */
         $this->view->title      = $this->lang->user->common . $this->lang->colon . $this->lang->user->task;
@@ -206,7 +206,7 @@ class user extends control
         $users   = $this->loadModel('dept')->getDeptUserPairs($user->dept, 'useid');
 
         /* Set menu. */
-        $this->view->userList = $this->user->setUserList($users, $userID);
+        $this->view->userList = $this->user->setUserList($this->user->getPairs('noempty|noclosed|nodeleted|useid|noletter'), $userID);
 
         /* Load the lang of bug module. */
         $this->app->loadLang('bug');
@@ -246,7 +246,7 @@ class user extends control
         $users   = $this->loadModel('dept')->getDeptUserPairs($user->dept, 'useid');
 
         /* Set menu. */
-        $this->view->userList = $this->user->setUserList($users, $userID);
+        $this->view->userList = $this->user->setUserList($this->user->getPairs('noempty|noclosed|nodeleted|useid|noletter'), $userID);
 
         /* Save session. */
         $this->session->set('testtaskList', $this->app->getURI(true), 'qa');
@@ -323,7 +323,7 @@ class user extends control
         $this->view->pageID     = $pageID;
         $this->view->orderBy    = $orderBy;
         $this->view->pager      = $pager;
-        $this->view->userList   = $this->user->setUserList($users, $userID);
+        $this->view->userList   = $this->user->setUserList($this->user->getPairs('noempty|noclosed|nodeleted|useid|noletter'), $userID);
 
         $this->display();
     }
@@ -353,7 +353,7 @@ class user extends control
 
         /* Set the menus. */
         $this->loadModel('project');
-        $this->view->userList = $this->user->setUserList($users, $userID);
+        $this->view->userList = $this->user->setUserList($this->user->getPairs('noempty|noclosed|nodeleted|useid|noletter'), $userID);
 
         $this->view->title      = $this->lang->user->common . $this->lang->colon . $this->lang->user->execution;
         $this->view->position[] = $this->lang->user->execution;
@@ -392,7 +392,7 @@ class user extends control
         $pager = pager::init($recTotal, $recPerPage, $pageID);
 
         /* Set the menus. */
-        $this->view->userList = $this->user->setUserList($users, $userID);
+        $this->view->userList = $this->user->setUserList($this->user->getPairs('noempty|noclosed|nodeleted|useid|noletter'), $userID);
 
         $this->view->title      = $this->lang->user->common . $this->lang->colon . $this->lang->user->issue;
         $this->view->position[] = $this->lang->user->issue;
@@ -432,7 +432,7 @@ class user extends control
         $pager = pager::init($recTotal, $recPerPage, $pageID);
 
         /* Set the menus. */
-        $this->view->userList = $this->user->setUserList($users, $userID);
+        $this->view->userList = $this->user->setUserList($this->user->getPairs('noempty|noclosed|nodeleted|useid|noletter'), $userID);
 
         $this->view->title      = $this->lang->user->common . $this->lang->colon . $this->lang->user->risk;
         $this->view->position[] = $this->lang->user->risk;
@@ -467,7 +467,7 @@ class user extends control
         $this->view->groups       = $this->loadModel('group')->getByAccount($account);
         $this->view->deptPath     = $this->dept->getParents($user->dept);
         $this->view->personalData = $this->user->getPersonalData($user->account);
-        $this->view->userList     = $this->user->setUserList($users, $userID);
+        $this->view->userList     = $this->user->setUserList($this->user->getPairs('noempty|noclosed|nodeleted|useid|noletter'), $userID);
 
         $this->display();
     }
@@ -1058,7 +1058,7 @@ class user extends control
         $users   = $this->loadModel('dept')->getDeptUserPairs($user->dept, 'useid');
 
         /* set menus. */
-        $this->view->userList = $this->user->setUserList($users, $userID);
+        $this->view->userList = $this->user->setUserList($this->user->getPairs('noempty|noclosed|nodeleted|useid|noletter'), $userID);
 
         /* Save session. */
         $uri = $this->app->getURI(true);