Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

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

Browse Source
This commit is contained in:
刘刚
2025-09-08 09:38:54 +08:00
committed by Gitfox
parent bbaac98a60 0fd75146a3
commit 10f0e27395
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/search/control.php
+2 -2
View File
@@ -30,8 +30,8 @@ class search extends control
$searchForm = $module . 'Form';
$searchParams = $module . 'searchParams';
$searchConfig = $this->search->processSearchParams($module);
$fields = $searchConfig['fields'];
$params = $searchConfig['params'];
$fields = $searchConfig['fields'] ?? [];
$params = $searchConfig['params'] ?? [];
if(!$this->session->$searchForm)
{
module/search/model.php
+4 -4
View File
@@ -28,7 +28,7 @@ class searchModel extends model
$funcModel = $this->session->$cacheKey['funcModel'] ?? '';
$funcName = $this->session->$cacheKey['funcName'] ?? '';
$funcArgs = $this->session->$cacheKey['funcArgs'] ?? [];
if(!$funcModel || !$funcName || !$funcArgs) return $this->session->{$module . 'searchParams'} ?? [];
if(!$funcModel || !$funcName || !$funcArgs) return $_SESSION[$module . 'searchParams'] ?? [];
$funcArgs['cacheSearchFunc'] = $cacheSearchFunc;
return $this->loadModel($funcModel)->$funcName(...array_values($funcArgs)); // PHP 8.0以下只能展开索引数组。PHP 8.0 below can only unpack indexed arrays.
@@ -122,8 +122,8 @@ class searchModel extends model
/* Init vars. */
$module = $this->post->module;
$searchConfig = $this->processSearchParams($module, true);
$searchFields = $searchConfig['fields'];
$fieldParams = $searchConfig['params'];
$searchFields = $searchConfig['fields'] ?? [] ;
$fieldParams = $searchConfig['params'] ?? [];
$groupItems = $this->config->search->groupItems;
$groupAndOr = strtoupper($this->post->groupAndOr);
if($groupAndOr != 'AND' && $groupAndOr != 'OR') $groupAndOr = 'AND';
@@ -195,7 +195,7 @@ class searchModel extends model
$groupAndOr = strtoupper($this->post->groupAndOr);
$module = $this->post->module;
$searchConfig = $this->processSearchParams($module, true);
$fieldParams = $searchConfig['params'];
$fieldParams = $searchConfig['params'] ?? [];
$scoreNum = 0;
if($groupAndOr != 'AND' and $groupAndOr != 'OR') $groupAndOr = 'AND';