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

* Fix bug #35718, dameng database full text search sql error.

Browse Source
This commit is contained in:
tanghucheng
2023-06-08 05:11:37 +00:00
parent 1972f906b5
commit d4c54e20d1
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/search/model.php
+14 -4
View File
@@ -711,17 +711,27 @@ class searchModel extends model
}
}
$scoreColumn = "(MATCH(title, content) AGAINST('{$againstCond}' IN BOOLEAN MODE))";
$stmt = $this->dao->select("*, {$scoreColumn} as score")
$orderBy = 'score_desc, editedDate_desc';
$scoreColumn = "*, (MATCH(title, content) AGAINST('{$againstCond}' IN BOOLEAN MODE)) as score";
$whereCondition = "(MATCH(title,content) AGAINST('{$againstCond}' IN BOOLEAN MODE) >= 1 {$likeCondition})";
if($this->config->db->driver == 'dm')
{
$whereCondition = preg_replace("/\b(AND|OR)\b/", "", $likeCondition, 1);
$scoreColumn = '*';
$orderBy = 'editedDate_desc';
}
$stmt = $this->dao->select($scoreColumn)
->from(TABLE_SEARCHINDEX)
->where("(MATCH(title,content) AGAINST('{$againstCond}' IN BOOLEAN MODE) >= 1 {$likeCondition})")
->where("($whereCondition)")
->andWhere('((vision')->eq($this->config->vision)
->andWhere('objectType')->in($allowedObject)
->markRight(1)
->orWhere('(objectType')->in($filterObject)
->markRight(2)
->andWhere('addedDate')->le(helper::now())
->orderBy('score_desc, editedDate_desc')
->orderBy($orderBy)
->query();
$idListGroup = array();