lanyuanxiaoyao/spring-boot-service-template
1
0
Fork 0
Code Activity

fix: 修复排序参数为空导致空匹配

Browse Source
This commit is contained in:
兰缘小妖
2025-08-30 17:16:07 +08:00
parent 2232adc51c
commit 78af47b715
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/com/lanyuanxiaoyao/service/template/service/SimpleServiceSupport.java
View File

@@ -363,10 +363,18 @@ public abstract class SimpleServiceSupport<ENTITY extends SimpleEntity> implemen
}); });
} }
if (ObjectHelper.isNotEmpty(queryable.getInside())) { if (ObjectHelper.isNotEmpty(queryable.getInside())) {
queryable.getInside().forEach((column, value) -> predicates.add(builder.in(column(root, column)).value(value))); queryable.getInside()
.entrySet()
.stream()
.filter(entry -> ObjectHelper.isNotEmpty(entry.getValue()))
.forEach(entry -> predicates.add(builder.in(column(root, entry.getKey())).value(entry.getValue())));
} }
if (ObjectHelper.isNotEmpty(queryable.getNotInside())) { if (ObjectHelper.isNotEmpty(queryable.getNotInside())) {
queryable.getNotInside().forEach((column, value) -> predicates.add(builder.in(column(root, column)).value(value).not())); queryable.getNotInside()
.entrySet()
.stream()
.filter(entry -> ObjectHelper.isNotEmpty(entry.getValue()))
.forEach(entry -> predicates.add(builder.in(column(root, entry.getKey())).value(entry.getValue()).not()));
} }
if (ObjectHelper.isNotEmpty(queryable.getBetween())) { if (ObjectHelper.isNotEmpty(queryable.getBetween())) {
queryable.getBetween().forEach((column, value) -> { queryable.getBetween().forEach((column, value) -> {