diff --git a/pom.xml b/pom.xml index 8c42cd10..0b05f8e4 100644 --- a/pom.xml +++ b/pom.xml @@ -6,13 +6,13 @@ org.springframework.boot spring-boot-starter-parent - 3.1.7 + 3.1.8 com.codingapi.springboot springboot-parent - 3.1.9 + 3.1.10 https://github.com/codingapi/springboot-framewrok springboot-parent diff --git a/springboot-starter-data-fast/pom.xml b/springboot-starter-data-fast/pom.xml index 17764984..1026a173 100644 --- a/springboot-starter-data-fast/pom.xml +++ b/springboot-starter-data-fast/pom.xml @@ -5,7 +5,7 @@ springboot-parent com.codingapi.springboot - 3.1.9 + 3.1.10 4.0.0 diff --git a/springboot-starter-security-jwt/pom.xml b/springboot-starter-security-jwt/pom.xml index 847a8db9..9fb6e94f 100644 --- a/springboot-starter-security-jwt/pom.xml +++ b/springboot-starter-security-jwt/pom.xml @@ -6,7 +6,7 @@ springboot-parent com.codingapi.springboot - 3.1.9 + 3.1.10 springboot-starter-security-jwt diff --git a/springboot-starter/pom.xml b/springboot-starter/pom.xml index 43dfc218..432a5763 100644 --- a/springboot-starter/pom.xml +++ b/springboot-starter/pom.xml @@ -5,7 +5,7 @@ com.codingapi.springboot springboot-parent - 3.1.9 + 3.1.10 springboot-starter diff --git a/springboot-starter/src/main/java/com/codingapi/springboot/framework/dto/request/SearchRequest.java b/springboot-starter/src/main/java/com/codingapi/springboot/framework/dto/request/SearchRequest.java index 9eabb215..bd1ff6b8 100644 --- a/springboot-starter/src/main/java/com/codingapi/springboot/framework/dto/request/SearchRequest.java +++ b/springboot-starter/src/main/java/com/codingapi/springboot/framework/dto/request/SearchRequest.java @@ -87,14 +87,21 @@ public ClassContent(Class clazz, PageRequest pageRequest) { public void addFilter(String key, String value) { Class keyClass = getKeyType(key); - Object v = JSON.parseObject(value, keyClass); + Object v = parseObject(value, keyClass); pageRequest.addFilter(key, Relation.EQUAL, v); } + private Object parseObject(String value, Class keyClass) { + if(value.getClass().equals(keyClass)) { + return value; + } + return JSON.parseObject(value, keyClass); + } + public void addFilter(String key, List value) { Class keyClass = getKeyType(key); pageRequest.addFilter(key, Relation.IN, value.stream() - .map(v -> JSON.parseObject(v, keyClass)) + .map(v -> parseObject(v, keyClass)) .toArray() ); }