diff --git a/module/bug/control.php b/module/bug/control.php
index 4a17c03668..d6a6ce65ab 100644
--- a/module/bug/control.php
+++ b/module/bug/control.php
@@ -43,7 +43,7 @@ class bug extends control
     {
         /* 设置产品id和模块id。*/
         $browseType = strtolower($browseType);
-        $productID  = common::saveProductState($productID, key($this->products));
+        $productID  = $this->product->saveState($productID, key($this->products));
         $moduleID   = ($browseType == 'bymodule') ? (int)$param : 0;
         $queryID    = ($browseType == 'bysearch') ? (int)$param : 0;
 
@@ -230,7 +230,7 @@ class bug extends control
         }
 
         /* 设置当前的产品，设置菜单。*/
-        $productID = common::saveProductState($productID, key($this->products));
+        $productID = $this->product->saveState($productID, key($this->products));
         $this->bug->setMenu($this->products, $productID);
 
         /* 去掉几个类型的设置。*/
diff --git a/module/common/control.php b/module/common/control.php
index 3b7d0a2fb2..106f7cbb06 100644
--- a/module/common/control.php
+++ b/module/common/control.php
@@ -338,16 +338,6 @@ EOT;
         return true;
     }
 
-    /* 保存最后浏览的产品id到session会话中。*/
-    public static function saveProductState($productID, $defaultProductID)
-    {
-        global $app;
-        if($productID > 0) $app->session->set('product', (int)$productID);
-        if($productID == 0 and $app->cookie->lastProduct)    $app->session->set('product', (int)$app->cookie->lastProduct);
-        if($productID == 0 and $app->session->product == '') $app->session->set('product', $defaultProductID);
-        return $app->session->product;
-    }
-
     /**
      * Create changes of one object.
      * 
diff --git a/module/product/control.php b/module/product/control.php
index a5abcc385f..788abf5740 100644
--- a/module/product/control.php
+++ b/module/product/control.php
@@ -45,7 +45,7 @@ class product extends control
         /* 设置当前的产品id和模块id。*/
         $this->session->set('storyList',   $this->app->getURI(true));
         $this->session->set('productList', $this->app->getURI(true));
-        $productID = common::saveProductState($productID, key($this->products));
+        $productID = $this->product->saveState($productID, key($this->products));
         $moduleID  = ($browseType == 'bymodule') ? (int)$param : 0;
         $queryID   = ($browseType == 'bysearch') ? (int)$param : 0;
 
diff --git a/module/product/model.php b/module/product/model.php
index 35e4221380..72f96c31a7 100644
--- a/module/product/model.php
+++ b/module/product/model.php
@@ -28,6 +28,22 @@ class productModel extends model
         }
     }
 
+    /**
+     * Save the product id user last visited to session.
+     * 
+     * @param  int $productID 
+     * @param  int $defaultProductID 
+     * @access public
+     * @return int
+     */
+    public function saveState($productID, $defaultProductID)
+    {
+        if($productID > 0) $this->session->set('product', (int)$productID);
+        if($productID == 0 and $this->cookie->lastProduct)    $this->session->set('product', (int)$this->cookie->lastProduct);
+        if($productID == 0 and $this->session->product == '') $this->session->set('product', $defaultProductID);
+        return $this->session->product;
+    }
+
     /* 检查权限。*/
     public function checkPriv($product)
     {
diff --git a/module/testcase/control.php b/module/testcase/control.php
index 4d22291438..9a0ab6480e 100644
--- a/module/testcase/control.php
+++ b/module/testcase/control.php
@@ -34,7 +34,7 @@ class testcase extends control
     {
         /* 设置浏览模式，产品ID和模块ID。 */
         $browseType = strtolower($browseType);
-        $productID = common::saveProductState($productID, key($this->products));
+        $productID = $this->product->saveState($productID, key($this->products));
         $moduleID  = ($browseType == 'bymodule') ? (int)$param : 0;
         $queryID   = ($browseType == 'bysearch') ? (int)$param : 0;
 
@@ -126,7 +126,7 @@ class testcase extends control
         }
         if(empty($this->products)) $this->locate($this->createLink('product', 'create'));
 
-        $productID       = common::saveProductState($productID, key($this->products));
+        $productID       = $this->product->saveState($productID, key($this->products));
         $currentModuleID = (int)$moduleID;
 
         /* 设置菜单。*/
diff --git a/module/testtask/control.php b/module/testtask/control.php
index 79919c5c42..cb00ad0b6d 100644
--- a/module/testtask/control.php
+++ b/module/testtask/control.php
@@ -34,7 +34,7 @@ class testtask extends control
         $this->session->set('testtaskList', $this->app->getURI(true));
 
         /* 设置产品和菜单。*/
-        $productID = common::saveProductState($productID, key($this->products));
+        $productID = $this->product->saveState($productID, key($this->products));
         $this->testtask->setMenu($this->products, $productID);
 
         /* 加载分页类。*/
@@ -66,7 +66,7 @@ class testtask extends control
         }
 
         /* 设置菜单。*/
-        $productID  = common::saveProductState($productID, key($this->products));
+        $productID  = $this->product->saveState($productID, key($this->products));
         $this->testtask->setMenu($this->products, $productID);
 
         /* 导航信息。*/
@@ -167,7 +167,7 @@ class testtask extends control
 
         /* 获得task信息。*/
         $task      = $this->testtask->getById($taskID);
-        $productID = common::saveProductState($task->product, key($this->products));
+        $productID = $this->product->saveState($task->product, key($this->products));
 
         /* 设置菜单。*/
         $this->testtask->setMenu($this->products, $productID);
@@ -212,7 +212,7 @@ class testtask extends control
 
         /* 获得task信息。*/
         $task      = $this->testtask->getById($taskID);
-        $productID = common::saveProductState($task->product, key($this->products));
+        $productID = $this->product->saveState($task->product, key($this->products));
 
         /* 构造搜索表单。*/
         $this->loadModel('testcase');