From 0a438c628d89ddb27317c02bbda4ba302471f947 Mon Sep 17 00:00:00 2001
From: holan20180123 <56391770@qq.com>
Date: Thu, 17 Sep 2020 16:16:25 +0800
Subject: [PATCH] * Finish task #7917.

---
 config/filter.php       | 1 +
 module/user/control.php | 5 ++---
 module/user/model.php   | 3 ++-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/config/filter.php b/config/filter.php
index 8a6c36de76..f989ee42c3 100644
--- a/config/filter.php
+++ b/config/filter.php
@@ -240,6 +240,7 @@ $filter->user->login->get['password']     = 'reg::any';
 $filter->user->edit->get['from']          = 'reg::word';
 $filter->user->ajaxgetmore->get['search'] = 'reg::any';
 $filter->user->ajaxgetmore->get['limit']  = 'int';
+$filter->user->ajaxgetmore->get['params'] = 'reg::base64';
 
 $filter->git->cat->get['repoUrl']  = 'reg::base64';
 $filter->git->diff->get['repoUrl'] = 'reg::base64';
diff --git a/module/user/control.php b/module/user/control.php
index e0302c50d8..2db7c7e7d0 100644
--- a/module/user/control.php
+++ b/module/user/control.php
@@ -1091,13 +1091,12 @@ class user extends control
     /**
      * Ajax get more user.
      * 
-     * @param  string $params 
      * @access public
      * @return void
      */
-    public function ajaxGetMore($params)
+    public function ajaxGetMore()
     {
-        $params = base64_decode($params);
+        $params = base64_decode($this->get->params);
         parse_str($params, $parsedParams);
         $users = $this->user->getPairs($parsedParams['params'], $parsedParams['usersToAppended']);
 
diff --git a/module/user/model.php b/module/user/model.php
index 9edf84d2de..9575700873 100644
--- a/module/user/model.php
+++ b/module/user/model.php
@@ -108,7 +108,8 @@ class userModel extends model
         {
             if(is_array($usersToAppended)) $usersToAppended = join(',', $usersToAppended);
             $moreLinkParams = "params={$params}&usersToAppended={$usersToAppended}";
-            $this->config->user->moreLink = helper::createLink('user', 'ajaxGetMore', "params=" . base64_encode($moreLinkParams));
+            $connectString  = $this->config->requestType == 'GET' ? '&' : '?';
+            $this->config->user->moreLink = helper::createLink('user', 'ajaxGetMore') . $connectString . "params=" . base64_encode($moreLinkParams);
         }
 
         if($usersToAppended) $users += $this->dao->select($fields)->from(TABLE_USER)->where('account')->in($usersToAppended)->fetchAll('account');