diff --git a/src/main/java/cn/lihongjie/coal/dto/CommonQuery.java b/src/main/java/cn/lihongjie/coal/dto/CommonQuery.java index 6b18d0dc..80ce8127 100644 --- a/src/main/java/cn/lihongjie/coal/dto/CommonQuery.java +++ b/src/main/java/cn/lihongjie/coal/dto/CommonQuery.java @@ -11,9 +11,11 @@ import jakarta.persistence.criteria.Root; import jakarta.persistence.metamodel.Attribute; import jakarta.persistence.metamodel.EntityType; import lombok.AllArgsConstructor; +import lombok.Builder; import lombok.Data; import lombok.With; import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.lang3.StringUtils; import org.springframework.core.convert.ConversionService; import org.springframework.data.domain.Sort; import org.springframework.data.jpa.domain.Specification; @@ -63,6 +65,7 @@ public class CommonQuery { private String key; private String opt; private String value; + @Builder.Default private String group = "default"; private String min; private String max; @@ -421,6 +424,8 @@ public class CommonQuery { if (CollectionUtils.isNotEmpty(items)) { + items.forEach(x -> x.setGroup(StringUtils.defaultIfBlank(x.getGroup(), "default"))); + Map> group = items.stream().collect(Collectors.groupingBy(i -> i.group)); List orPredicates = new ArrayList<>();