diff --git a/module/bug/control.php b/module/bug/control.php
index 6e6348c587..3aeee1878a 100644
--- a/module/bug/control.php
+++ b/module/bug/control.php
@@ -607,8 +607,8 @@ class bug extends control
         /* Judge bug exits or not. */
         $bug = $this->bug->getById($bugID, true);
         if(!$bug) die(js::error($this->lang->notFound) . js::locate('back'));
-        $this->session->PRJ = $bug->project;
-        $this->view->products   = $this->products = $this->product->getProductPairsByProject($this->session->PRJ);
+        if($bug->project) $this->session->PRJ = $bug->project;
+        $this->view->products = $this->products = $this->product->getProductPairsByProject($this->session->PRJ);
 
         $this->bug->checkBugExecutionPriv($bug);
 
diff --git a/module/common/lang/en.php b/module/common/lang/en.php
index 6fa36ce027..e2b5c18b00 100644
--- a/module/common/lang/en.php
+++ b/module/common/lang/en.php
@@ -222,9 +222,10 @@ $lang->productplan->menu = $lang->product->menu;
 /* System menu. */
 $lang->system = new stdclass();
 $lang->system->menu = new stdclass();
-$lang->system->menu->company  = array('link' => 'User|company|browse|', 'subModule' => ',user,dept,group,', 'alias' => ',dynamic,view,');
-$lang->system->menu->team     = array('link' => 'Team|my|team|');
+$lang->system->menu->team     = array('link' => 'Team|my|team|', 'subModule' => 'user');
 $lang->system->menu->calendar = array('link' => 'Calendar|my|calendar|', 'subModule' => 'todo', 'alias' => 'todo');
+$lang->system->menu->dynamic  = 'Dynamic|company|dynamic|';
+$lang->system->menu->view     = array('link' => 'Company|company|view');
 
 $lang->measurement = new stdclass();
 $lang->measurement->menu = new stdclass();
@@ -520,6 +521,7 @@ $lang->company->menu->browseGroup = array('link' => 'Group|group|browse', 'subMo
 $lang->admin = new stdclass();
 $lang->admin->menu = new stdclass();
 $lang->admin->menu->index     = array('link' => 'Home|admin|index', 'alias' => 'register,certifytemail,certifyztmobile,ztcompany');
+$lang->admin->menu->company   = array('link' => 'User|company|browse|', 'subModule' => ',user,dept,group,');
 $lang->admin->menu->model     = array('link' => 'Model|custom|browsestoryconcept|', 'subModule' => 'holiday');
 $lang->admin->menu->custom    = array('link' => 'Custom|custom|index', 'subModule' => 'custom');
 $lang->admin->menu->extension = array('link' => 'Extension|extension|browse', 'subModule' => 'extension');
@@ -531,6 +533,10 @@ $lang->subject = new stdclass();
 $lang->subject->menu = new stdclass();
 $lang->subject->menu->storyConcept = array('link' => 'Story Concpet|custom|browsestoryconcept|');
 
+$lang->dept->menu  = $lang->company->menu;
+$lang->group->menu = $lang->company->menu;
+$lang->user->menu  = $lang->company->menu;
+
 $lang->admin->subMenu = new stdclass();
 $lang->admin->subMenu->message = new stdclass();
 $lang->admin->subMenu->message->mail    = array('link' => 'Mail|mail|index', 'subModule' => 'mail');
@@ -612,7 +618,6 @@ $lang->menugroup->job     = 'ci';
 /* Nav group.*/
 $lang->navGroup = new stdclass();
 $lang->navGroup->my     = 'my';
-$lang->navGroup->todo   = 'my';
 $lang->navGroup->effort = 'my';
 $lang->navGroup->score  = 'my';
 
@@ -663,6 +668,8 @@ $lang->navGroup->build     = 'execution';
 $lang->navGroup->sqlbuilder    = 'system';
 $lang->navGroup->auditcl       = 'system';
 $lang->navGroup->cmcl          = 'system';
+$lang->navGroup->todo          = 'system';
+$lang->navGroup->ldap          = 'system';
 $lang->navGroup->process       = 'system';
 $lang->navGroup->activity      = 'system';
 $lang->navGroup->zoutput       = 'system';
@@ -681,17 +688,18 @@ $lang->navGroup->lieu     = 'attend';
 $lang->navGroup->admin     = 'admin';
 $lang->navGroup->company   = 'admin';
 $lang->navGroup->dept      = 'admin';
-$lang->navGroup->ldap      = 'admin';
+$lang->navGroup->user      = 'admin';
 $lang->navGroup->group     = 'admin';
+$lang->navGroup->dept      = 'admin';
 $lang->navGroup->webhook   = 'admin';
 $lang->navGroup->sms       = 'admin';
 $lang->navGroup->message   = 'admin';
-$lang->navGroup->user      = 'admin';
 $lang->navGroup->custom    = 'admin';
 $lang->navGroup->cron      = 'admin';
 $lang->navGroup->backup    = 'admin';
 $lang->navGroup->mail      = 'admin';
 $lang->navGroup->dev       = 'admin';
+$lang->navGroup->entry     = 'admin';
 $lang->navGroup->extension = 'admin';
 $lang->navGroup->action    = 'admin';
 $lang->navGroup->search    = 'admin';
diff --git a/module/common/lang/menuOrder.php b/module/common/lang/menuOrder.php
index c5ae0b2f4b..b46eb228e6 100644
--- a/module/common/lang/menuOrder.php
+++ b/module/common/lang/menuOrder.php
@@ -154,10 +154,11 @@ $lang->system->menuOrder[15] = 'calendar';
 
 /* admin menu order. */
 $lang->admin->menuOrder[5]  = 'index';
-$lang->admin->menuOrder[10] = 'model';
-$lang->admin->menuOrder[15] = 'custom';
-$lang->admin->menuOrder[20] = 'message';
-$lang->admin->menuOrder[25] = 'extension';
+$lang->admin->menuOrder[10] = 'company';
+$lang->admin->menuOrder[15] = 'model';
+$lang->admin->menuOrder[20] = 'custom';
+$lang->admin->menuOrder[25] = 'message';
+$lang->admin->menuOrder[30] = 'extension';
 $lang->admin->menuOrder[35] = 'dev';
 $lang->admin->menuOrder[40] = 'system';
 
diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php
index 0d12429983..77bc272332 100644
--- a/module/common/lang/zh-cn.php
+++ b/module/common/lang/zh-cn.php
@@ -149,7 +149,7 @@ $lang->mainNav->qa      = '<i class="icon icon-test"></i> 测试|qa|index|';
 $lang->mainNav->repo    = '<i class="icon icon-code1"></i> 代码|repo|browse|';
 $lang->mainNav->doc     = '<i class="icon icon-doc"></i> 文档|doc|index|';
 $lang->mainNav->report  = "<i class='icon icon-statistic'></i> 统计|report|productSummary|";
-$lang->mainNav->system  = '<i class="icon icon-group"></i> 组织|company|browse|';
+$lang->mainNav->system  = '<i class="icon icon-group"></i> 组织|my|team|';
 $lang->mainNav->admin   = '<i class="icon icon-cog-outline"></i> 后台|admin|index|';
 if($config->systemMode == 'new') $lang->mainNav->program = "<i class='icon icon-program'></i> 项目集|$programModule|$programMethod|";
 
@@ -222,9 +222,10 @@ $lang->productplan->menu = $lang->product->menu;
 /* System menu. */
 $lang->system = new stdclass();
 $lang->system->menu = new stdclass();
-$lang->system->menu->company  = array('link' => '人员|company|browse|', 'subModule' => ',user,dept,group,', 'alias' => ',dynamic,view,');
-$lang->system->menu->team     = array('link' => '团队|my|team|');
+$lang->system->menu->team     = array('link' => '团队|my|team|', 'subModule' => 'user');
 $lang->system->menu->calendar = array('link' => '日程|my|calendar|', 'subModule' => 'todo', 'alias' => 'todo');
+$lang->system->menu->dynamic  = '动态|company|dynamic|';
+$lang->system->menu->view     = array('link' => '公司|company|view');
 
 $lang->measurement = new stdclass();
 $lang->measurement->menu = new stdclass();
@@ -518,13 +519,12 @@ $lang->company->menu = new stdclass();
 $lang->company->menu->browseUser  = array('link' => '用户|company|browse', 'subModule' => ',user,');
 $lang->company->menu->dept        = array('link' => '部门|dept|browse', 'subModule' => 'dept');
 $lang->company->menu->browseGroup = array('link' => '权限|group|browse', 'subModule' => 'group');
-$lang->company->menu->dynamic     = '动态|company|dynamic|';
-$lang->company->menu->view        = array('link' => '公司|company|view');
 
 /* 后台管理菜单设置。*/
 $lang->admin = new stdclass();
 $lang->admin->menu = new stdclass();
 $lang->admin->menu->index     = array('link' => '首页|admin|index', 'alias' => 'register,certifytemail,certifyztmobile,ztcompany');
+$lang->admin->menu->company   = array('link' => '人员|company|browse|', 'subModule' => ',user,dept,group,');
 $lang->admin->menu->model     = array('link' => '模型|custom|browsestoryconcept|', 'subModule' => 'holiday');
 $lang->admin->menu->custom    = array('link' => '自定义|custom|index', 'subModule' => 'custom');
 $lang->admin->menu->extension = array('link' => '插件|extension|browse', 'subModule' => 'extension');
@@ -536,9 +536,9 @@ $lang->subject = new stdclass();
 $lang->subject->menu = new stdclass();
 $lang->subject->menu->storyConcept = array('link' => '需求概念|custom|browsestoryconcept|');
 
-$lang->dept->menu    = $lang->company->menu;
-$lang->group->menu   = $lang->company->menu;
-$lang->user->menu    = $lang->company->menu;
+$lang->dept->menu  = $lang->company->menu;
+$lang->group->menu = $lang->company->menu;
+$lang->user->menu  = $lang->company->menu;
 
 $lang->admin->subMenu = new stdclass();
 $lang->admin->subMenu->message = new stdclass();
@@ -621,7 +621,6 @@ $lang->menugroup->job     = 'ci';
 /* Nav group.*/
 $lang->navGroup = new stdclass();
 $lang->navGroup->my     = 'my';
-$lang->navGroup->todo   = 'my';
 $lang->navGroup->effort = 'my';
 $lang->navGroup->score  = 'my';
 
@@ -669,13 +668,10 @@ $lang->navGroup->execution = 'execution';
 $lang->navGroup->task      = 'execution';
 $lang->navGroup->build     = 'execution';
 
-$lang->navGroup->company       = 'system';
 $lang->navGroup->sqlbuilder    = 'system';
 $lang->navGroup->auditcl       = 'system';
 $lang->navGroup->cmcl          = 'system';
-$lang->navGroup->user          = 'system';
-$lang->navGroup->group         = 'system';
-$lang->navGroup->dept          = 'system';
+$lang->navGroup->todo          = 'system';
 $lang->navGroup->ldap          = 'system';
 $lang->navGroup->process       = 'system';
 $lang->navGroup->activity      = 'system';
@@ -693,6 +689,11 @@ $lang->navGroup->overtime = 'attend';
 $lang->navGroup->lieu     = 'attend';
 
 $lang->navGroup->admin     = 'admin';
+$lang->navGroup->company   = 'admin';
+$lang->navGroup->dept      = 'admin';
+$lang->navGroup->user      = 'admin';
+$lang->navGroup->group     = 'admin';
+$lang->navGroup->dept      = 'admin';
 $lang->navGroup->webhook   = 'admin';
 $lang->navGroup->sms       = 'admin';
 $lang->navGroup->message   = 'admin';
diff --git a/module/company/control.php b/module/company/control.php
index b1ab021140..28b9e5eead 100644
--- a/module/company/control.php
+++ b/module/company/control.php
@@ -147,6 +147,9 @@ class company extends control
      */
     public function view()
     {
+        $this->lang->navGroup->company = 'system';
+        $this->lang->noMenuModule[]    = 'company';
+
         $this->company->setMenu();
         $this->view->title      = $this->lang->company->common . $this->lang->colon . $this->lang->company->view;
         $this->view->position[] = $this->lang->company->view;
@@ -167,6 +170,9 @@ class company extends control
      */
     public function dynamic($browseType = 'today', $param = '', $recTotal = 0, $date = '', $direction = 'next')
     {
+        $this->lang->navGroup->company = 'system';
+        $this->lang->noMenuModule[]    = 'company';
+
         $this->company->setMenu();
         $this->app->loadLang('user');
         $this->app->loadLang('execution');
diff --git a/module/company/css/browse.css b/module/company/css/browse.css
index 8b467bb46b..712cfcb024 100644
--- a/module/company/css/browse.css
+++ b/module/company/css/browse.css
@@ -1,5 +1,4 @@
 #titlebar {display: none;}
-form {position: relative;}
 #querybox {float: none !important; width: auto;}
 #moreOrLite {right: 10px !important;}
 
diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php
index 2acc1d244f..26fab016e3 100644
--- a/module/group/lang/resource.php
+++ b/module/group/lang/resource.php
@@ -1062,7 +1062,6 @@ $lang->mail->methodOrder[65] = 'ztCloud';
 $lang->resource->custom = new stdclass();
 $lang->resource->custom->index              = 'index';
 $lang->resource->custom->set                = 'set';
-$lang->resource->custom->project            = 'project';
 $lang->resource->custom->product            = 'product';
 $lang->resource->custom->restore            = 'restore';
 $lang->resource->custom->flow               = 'flow';
@@ -1076,17 +1075,16 @@ $lang->resource->custom->deleteStoryConcept = 'deleteStoryConcept';
 
 $lang->custom->methodOrder[5]  = 'index';
 $lang->custom->methodOrder[10] = 'set';
-$lang->custom->methodOrder[15] = 'project';
-$lang->custom->methodOrder[20] = 'product';
-$lang->custom->methodOrder[25] = 'restore';
-$lang->custom->methodOrder[30] = 'flow';
-$lang->custom->methodOrder[35] = 'working';
-$lang->custom->methodOrder[40] = 'setPublic';
-$lang->custom->methodOrder[45] = 'timezone';
-$lang->custom->methodOrder[55] = 'setStoryContcept';
-$lang->custom->methodOrder[60] = 'editStoryContcept';
-$lang->custom->methodOrder[65] = 'browseStoryContcept';
-$lang->custom->methodOrder[70] = 'deleteStoryContcept';
+$lang->custom->methodOrder[15] = 'product';
+$lang->custom->methodOrder[20] = 'restore';
+$lang->custom->methodOrder[25] = 'flow';
+$lang->custom->methodOrder[30] = 'working';
+$lang->custom->methodOrder[35] = 'setPublic';
+$lang->custom->methodOrder[40] = 'timezone';
+$lang->custom->methodOrder[45] = 'setStoryContcept';
+$lang->custom->methodOrder[50] = 'editStoryContcept';
+$lang->custom->methodOrder[55] = 'browseStoryContcept';
+$lang->custom->methodOrder[60] = 'deleteStoryContcept';
 
 $lang->resource->datatable = new stdclass();
 $lang->resource->datatable->setGlobal = 'setGlobal';
diff --git a/module/index/js/index.js b/module/index/js/index.js
index 2edf4b424a..289e23c30a 100644
--- a/module/index/js/index.js
+++ b/module/index/js/index.js
@@ -113,7 +113,12 @@
         {
             if(methodLowerCase === 'create' && (link.params.programID || link.params.$1)) return 'program';
         }
-        if(moduleName === 'my') if(methodLowerCase === 'team' || methodLowerCase == 'calendar') return 'system';
+        if(moduleName === 'user')    
+        {
+            if(['todo', 'task', 'story', 'bug', 'testtask', 'testcase', 'execution', 'dynamic', 'profile'].includes(methodLowerCase)) return 'system';
+        }
+        if(moduleName === 'my')      if(methodLowerCase === 'team'    || methodLowerCase == 'calendar') return 'system';
+        if(moduleName === 'company') if(methodLowerCase === 'dynamic' || methodLowerCase == 'view') return 'system';
         if(moduleName === 'tree')
         {
             if(methodLowerCase === 'browse')
@@ -131,9 +136,6 @@
             }
         }
 
-        var myMethods = 'todocalendar|effortcalendar|todo|task|story|bug|testtask|testcase|execution|issue|risk|dynamic|profile';
-        if(moduleName === 'user' && myMethods.indexOf(methodLowerCase) != -1) return 'my';
-
         code = window.navGroup[moduleName] || moduleName || urlOrModuleName;
         return appsMap[code] ? code : '';
     }