dongjunchuan/de
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #7315 from dataease/pr@dev@fix_pg_number_like_filter

Browse Source 
fix: PG数据源使用数字下拉模糊搜索报错
This commit is contained in:
fit2cloud-chenyw 2023-12-25 14:03:55 +08:00 committed by GitHub
commit 5d59334b67
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
core/backend/src/main/java/io/dataease/provider/query/pg/PgQueryProvider.java
View File

@ -183,8 +183,13 @@ public class PgQueryProvider extends QueryProvider {
String whereTrees = transFilterTrees(tableObj, rowPermissionsTree); String whereTrees = transFilterTrees(tableObj, rowPermissionsTree);
List<String> wheres = new ArrayList<>(); List<String> wheres = new ArrayList<>();
if (customWheres != null) wheres.add(customWheres); if (customWheres != null) wheres.add(customWheres);
if (StringUtils.isNotBlank(keyword)) { if (StringUtils.isNotBlank(keyword) && CollectionUtils.isNotEmpty(xFields)) {
String keyWhere = "(" + transKeywordFilterList(tableObj, xFields, keyword) + ")"; List<SQLObj> formatFields = xFields.stream().peek(f -> {
String fieldOriginName = f.getFieldOriginName();
String format = String.format(PgConstants.CAST, fieldOriginName, "VARCHAR");
f.setFieldOriginName(format);
}).collect(Collectors.toList());
String keyWhere = "(" + transKeywordFilterList(tableObj, formatFields, keyword) + ")";
wheres.add(keyWhere); wheres.add(keyWhere);
} }
if (whereTrees != null) wheres.add(whereTrees); if (whereTrees != null) wheres.add(whereTrees);