From 29b4f00f74409be7967f66a24325400e1c874132 Mon Sep 17 00:00:00 2001
From: zhujinyong <vimrus.com@gmail.com>
Date: Wed, 17 Mar 2021 15:16:28 +0800
Subject: [PATCH 1/2] * Fix bug: menu error when creating project.

---
 module/common/lang/zh-cn.php |  6 +++---
 module/common/model.php      | 31 ++++++++++++++++---------------
 2 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php
index 2744f4edbe..ef6fb1b4e3 100644
--- a/module/common/lang/zh-cn.php
+++ b/module/common/lang/zh-cn.php
@@ -160,14 +160,14 @@ $lang->program->homeMenu = new stdclass();
 $lang->program->homeMenu->browse = array('link' => '项目集|program|browse|');
 
 $lang->project = new stdclass();
-$lang->project->menu = new stdclass();
+$lang->project->homeMenu = new stdclass();
 if($config->systemMode == 'new')
 {
-    $lang->project->menu->browse = array('link' => '项目|project|browse|');
+    $lang->project->homeMenu->browse = array('link' => '项目|project|browse|');
 }
 else
 {
-    $lang->project->menu->browse = array('link' => "$lang->executionCommon|project|browse|");
+    $lang->project->homeMenu->browse = array('link' => "$lang->executionCommon|project|browse|");
 }
 
 $lang->project->dividerMenu = ',execution,programplan,doc,dynamic,';
diff --git a/module/common/model.php b/module/common/model.php
index 8b19335697..7039f9b5e4 100644
--- a/module/common/model.php
+++ b/module/common/model.php
@@ -2289,19 +2289,6 @@ EOD;
     {
         global $lang, $config;
 
-        if($openApp == 'project')
-        {
-            if($config->systemMode == 'classic' or ($moduleName == 'project' and $methodName == 'browse'))
-            {
-                $lang->menu = $lang->project->menu;
-            }
-            else
-            {
-                $lang->menu = self::getProjectMainMenu($moduleName);
-            }
-            return;
-        }
-
         if(!isset($lang->$openApp->homeMenu))
         {
             $lang->menu      = $lang->$openApp->menu;
@@ -2327,8 +2314,22 @@ EOD;
             }
         }
 
-        $lang->menu      = $lang->$openApp->menu;
-        $lang->menuOrder = $lang->$openApp->menuOrder;
+        if($openApp == 'project')
+        {
+            if($config->systemMode == 'classic' or ($moduleName == 'project' and $methodName == 'browse'))
+            {
+                $lang->menu = $lang->project->homeMenu;
+            }
+            else
+            {
+                $lang->menu = self::getProjectMainMenu($moduleName);
+            }
+        }
+        else
+        {
+            $lang->menu      = $lang->$openApp->menu;
+            $lang->menuOrder = $lang->$openApp->menuOrder;
+        }
     }
 
     /**

From e279dff340a521a9530390d9bd624161777e0352 Mon Sep 17 00:00:00 2001
From: leiyong <1549684884@qq.com>
Date: Wed, 17 Mar 2021 15:24:33 +0800
Subject: [PATCH 2/2] * Finish task#36767.

---
 framework/base/router.class.php | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/framework/base/router.class.php b/framework/base/router.class.php
index e8adf04cce..81a2a96b64 100644
--- a/framework/base/router.class.php
+++ b/framework/base/router.class.php
@@ -376,13 +376,13 @@ class baseRouter
         $this->loadClass('dao',    $static = true);
         $this->loadClass('mobile', $static = true);
 
+        $this->setOpenApp();
         $this->setSuperVars();
         $this->setDebug();
         $this->setErrorHandler();
         $this->setTimezone();
         $this->startSession();
         $this->setProject();
-        $this->setOpenApp();
 
         if($this->config->framework->multiSite)     $this->setSiteCode() && $this->loadExtraConfig();
         if($this->config->framework->autoConnectDB) $this->connectDB();
@@ -600,7 +600,7 @@ class baseRouter
         $this->get     = new super('get');
         $this->server  = new super('server');
         $this->cookie  = new super('cookie');
-        $this->session = new super('session');
+        $this->session = new super('session', $this->openApp);
 
         unset($GLOBALS);
         unset($_REQUEST);
@@ -2477,9 +2477,10 @@ class super
      * @access  public
      * @return  void
      */
-    public function __construct($scope)
+    public function __construct($scope, $openApp = '')
     {
-        $this->scope = $scope;
+        $this->scope   = $scope;
+        $this->openApp = $openApp;
     }
 
     /**
@@ -2511,6 +2512,8 @@ class super
         }
         elseif($this->scope == 'session')
         {
+            $openApp = $this->openApp;
+            empty($openApp) ? $_SESSION[$key] = $value : $_SESSION['app-' . $openApp][$key] = $value;
             $_SESSION[$key] = $value;
         }
         elseif($this->scope == 'env')