center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

Merge pull request #4746 from dataease/pr@dev@fix_tree_filter

Browse Source 
fix(过滤器): 树过滤器在sqlserver和ck数据源不能选择单字段过滤
This commit is contained in:
fit2cloud-chenyw 2023-03-10 12:13:14 +08:00 committed by GitHub
commit 8b3fe64325
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/src/main/java/io/dataease/provider/query/ck/CKQueryProvider.java
View File

@ -1170,7 +1170,7 @@ public class CKQueryProvider extends QueryProvider {
} }
String whereName = ""; String whereName = "";
if (request.getIsTree()) { if (request.getIsTree() && whereNameList.size() > 1) {
whereName = "CONCAT(" + StringUtils.join(whereNameList, ",',',") + ")"; whereName = "CONCAT(" + StringUtils.join(whereNameList, ",',',") + ")";
} else { } else {
whereName = whereNameList.get(0); whereName = whereNameList.get(0);

2
backend/src/main/java/io/dataease/provider/query/sqlserver/SqlserverQueryProvider.java
View File

@ -1107,7 +1107,7 @@ public class SqlserverQueryProvider extends QueryProvider {
} }
String whereName = ""; String whereName = "";
if (request.getIsTree()) { if (request.getIsTree() && whereNameList.size() > 1) {
whereName = "CONCAT(" + StringUtils.join(whereNameList, ",',',") + ")"; whereName = "CONCAT(" + StringUtils.join(whereNameList, ",',',") + ")";
} else { } else {
whereName = whereNameList.get(0); whereName = whereNameList.get(0);