timi/timi-spring
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix pageExample

Browse Source
This commit is contained in:
Timi
2025-12-09 10:21:41 +08:00
parent 7a52560779
commit 413f376a15
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/com/imyeyu/spring/util/SQLProvider.java
View File

@ -65,7 +65,7 @@ public class SQLProvider {
.filter(fc -> fc.isNotNull(obj)) .filter(fc -> fc.isNotNull(obj))
.map(fc -> "`%s` = '%s'".formatted(fc.columnName, fc.getAsString(obj))) .map(fc -> "`%s` = '%s'".formatted(fc.columnName, fc.getAsString(obj)))
.collect(Collectors.joining(" AND ")); .collect(Collectors.joining(" AND "));
sql.append(conditionClause); sql.append(" AND ").append(conditionClause);
} }
if (TimiJava.isNotEmpty(page.getLikeExample())) { if (TimiJava.isNotEmpty(page.getLikeExample())) {
// 模糊查询 // 模糊查询
@ -74,8 +74,8 @@ public class SQLProvider {
String conditionClause = metaExample.fieldColumnList.stream() String conditionClause = metaExample.fieldColumnList.stream()
.filter(fc -> fc.isNotNull(obj)) .filter(fc -> fc.isNotNull(obj))
.map(fc -> "`%s` LIKE CONCAT('%%', '%s', '%%')".formatted(fc.columnName, fc.getAsString(obj))) .map(fc -> "`%s` LIKE CONCAT('%%', '%s', '%%')".formatted(fc.columnName, fc.getAsString(obj)))
.collect(Collectors.joining(" AND ")); .collect(Collectors.joining(" OR "));
sql.append(conditionClause); sql.append(" AND (").append(conditionClause).append(')');
} }
// 排序 // 排序
if (TimiJava.isNotEmpty(page.getOrderMap())) { if (TimiJava.isNotEmpty(page.getOrderMap())) {
@ -123,7 +123,7 @@ public class SQLProvider {
.filter(fc -> fc.isNotNull(obj)) .filter(fc -> fc.isNotNull(obj))
.map(fc -> "`%s` = '%s'".formatted(fc.columnName, fc.getAsString(obj))) .map(fc -> "`%s` = '%s'".formatted(fc.columnName, fc.getAsString(obj)))
.collect(Collectors.joining(" AND ")); .collect(Collectors.joining(" AND "));
sql.append(conditionClause); sql.append(" AND ").append(conditionClause);
} }
if (TimiJava.isNotEmpty(page.getLikeExample())) { if (TimiJava.isNotEmpty(page.getLikeExample())) {
// 模糊查询 // 模糊查询
@ -132,8 +132,8 @@ public class SQLProvider {
String conditionClause = metaExample.fieldColumnList.stream() String conditionClause = metaExample.fieldColumnList.stream()
.filter(fc -> fc.isNotNull(obj)) .filter(fc -> fc.isNotNull(obj))
.map(fc -> "`%s` LIKE CONCAT('%%', '%s', '%%')".formatted(fc.columnName, fc.getAsString(obj))) .map(fc -> "`%s` LIKE CONCAT('%%', '%s', '%%')".formatted(fc.columnName, fc.getAsString(obj)))
.collect(Collectors.joining(" AND ")); .collect(Collectors.joining(" OR "));
sql.append(conditionClause); sql.append(" AND (").append(conditionClause).append(')');
} }
return sql.toString(); return sql.toString();
} }