From 19654268270c5146ab5bbc2d016c4891573d7a6a Mon Sep 17 00:00:00 2001
From: mayue <mayue@easycorp.ltd>
Date: Thu, 2 Jun 2022 13:22:13 +0800
Subject: [PATCH] * Finish task #55852.

---
 config/filter.php          | 19 ++++++++++---------
 module/company/control.php |  3 +++
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/config/filter.php b/config/filter.php
index eeb4c9df87..d66232b8ab 100644
--- a/config/filter.php
+++ b/config/filter.php
@@ -149,6 +149,7 @@ $filter->todo->export             = new stdclass();
 $filter->upgrade->license         = new stdclass();
 $filter->user->login              = new stdclass();
 $filter->user->edit               = new stdclass();
+$filter->user->export             = new stdclass();
 $filter->webhook->bind            = new stdclass();
 $filter->user->ajaxgetmore        = new stdclass();
 $filter->repo->ajaxsynccommit     = new stdclass();
@@ -320,8 +321,6 @@ $filter->testtask->default->cookie['preProductID'] = 'int';
 
 $filter->todo->export->cookie['checkedItem'] = 'reg::checked';
 
-$filter->user->login->cookie['keepLogin'] = 'equal::on';
-
 $filter->block->default->get['hash']    = 'reg::md5';
 $filter->block->main->get['blockid']    = 'code';
 $filter->block->main->get['blockTitle'] = 'reg::any';
@@ -359,13 +358,15 @@ $filter->sso->logout->get['token']      = 'reg::md5';
 
 $filter->upgrade->license->get['agree'] = 'equal::true';
 
-$filter->user->login->get['account']      = 'account';
-$filter->user->login->get['lang']         = 'reg::lang';
-$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->user->export->cookie['checkedItem'] = 'reg::checked';
+$filter->user->login->cookie['keepLogin']    = 'equal::on';
+$filter->user->login->get['account']         = 'account';
+$filter->user->login->get['lang']            = 'reg::lang';
+$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/company/control.php b/module/company/control.php
index 55bbbb75c4..17010e0d32 100644
--- a/module/company/control.php
+++ b/module/company/control.php
@@ -73,6 +73,9 @@ class company extends control
         /* Get users. */
         $users = $this->company->getUsers($browseType, $type, $queryID, $deptID, $sort, $pager);
 
+        /* Process the sql, get the conditon partion, save it to session. */
+        $this->loadModel('common')->saveQueryCondition($this->dao->get(), 'user', true);
+
         /* Remove passwd. */
         foreach($users as $user) unset($user->password);