* fix bug #1940.

framework/router.class.php

@@ -38,6 +38,15 @@ class router extends baseRouter
      */
     public $rawMethod;
 
+    /**
+     * 请求的原始方法名。
+     * The requested params parsed from a URL.
+     *
+     * @var array
+     * @access public
+     */
+    public $rawParams;
+
     /**
      * 标记是否是工作流
      * Whether the tag is a workflow
@@ -479,6 +488,7 @@ class router extends baseRouter
         /* The display parameter is used to mark whether the request comes from the card display page of the ZenTao client. It should be deleted here to avoid affecting the method call. */
         unset($passedParams['display']);
 
-        return parent::mergeParams($defaultParams, $passedParams);
+        $this->rawParams = parent::mergeParams($defaultParams, $passedParams);
+        return $this->rawParams;
     }
 }

lib/base/pager/pager.class.php

@@ -271,9 +271,9 @@ class basePager
      * @access public
      * @return void
      */
-    public function setParams()
+    public function setParams($params = array())
     {
-        $this->params = $this->app->getParams();
+        $this->params = $params ? $params : $this->app->getParams();
         foreach($this->params as $key => $value)
         {
             if(strtolower($key) == 'rectotal')   $this->params[$key] = $this->recTotal;

lib/pager/pager.class.php

@@ -70,9 +70,16 @@ class pager extends basePager
      * @access public
      * @return void
      */
-    public function setParams()
+    public function setParams($params = array())
     {
-        parent::setParams();
+        if(isset($this->app->rawParams))
+        {
+            parent::setParams($this->app->rawParams);
+        }
+        else
+        {
+            parent::setParams();
+        }
 
         /* If the original module name and method name of the request are set, the module parameter is removed. */
         if($this->app->isFlow) unset($this->params['module']);