Merge branch release/21.7.5 of zentao/zentaopms (#10998)

This commit is contained in:
刘刚
2025-08-19 08:59:22 +08:00
committed by Gitfox
2 changed files with 3 additions and 3 deletions
+1 -1
View File
@@ -84,7 +84,7 @@ class search extends control
$searchForm = $module . 'Form';
$searchConfig = $this->search->processSearchParams($module);
$fields = $searchConfig['fields'] ?? $fields;
$params = $searchConfig['fields'] ?? $params;
$params = $searchConfig['params'] ?? $params;
$_SESSION['searchParams']['module'] = $module;
if(empty($_SESSION[$searchForm])) $this->search->initOldSession($module, $fields, $params);
+2 -2
View File
@@ -56,8 +56,8 @@ class searchModel extends model
if(empty($_SESSION[$module . 'SearchFunc']))
{
$searchParams['searchFields'] = $searchConfig['fields'];
$searchParams['fieldParams'] = $searchConfig['params'];
$searchParams['fields'] = $searchConfig['fields'];
$searchParams['params'] = $searchConfig['params'];
}
$this->session->set($module . 'searchParams', $searchParams);