Merge pull request #39 from codingapi/3.x

fix #38
codingapi · Jan 29, 2024 · c82ecc9 · c82ecc9
2 parents 6b9cd98 + d3d9509
commit c82ecc9
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 7 deletions.
diff --git a/pom.xml b/pom.xml
@@ -6,13 +6,13 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.1.7</version>
+        <version>3.1.8</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
 
     <groupId>com.codingapi.springboot</groupId>
     <artifactId>springboot-parent</artifactId>
-    <version>3.1.9</version>
+    <version>3.1.10</version>
 
     <url>https://github.com/codingapi/springboot-framewrok</url>
     <name>springboot-parent</name>

diff --git a/springboot-starter-data-fast/pom.xml b/springboot-starter-data-fast/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>springboot-parent</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>3.1.9</version>
+        <version>3.1.10</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/springboot-starter-security-jwt/pom.xml b/springboot-starter-security-jwt/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <artifactId>springboot-parent</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>3.1.9</version>
+        <version>3.1.10</version>
     </parent>
 
     <artifactId>springboot-starter-security-jwt</artifactId>

diff --git a/springboot-starter/pom.xml b/springboot-starter/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.codingapi.springboot</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>3.1.9</version>
+        <version>3.1.10</version>
     </parent>
     <artifactId>springboot-starter</artifactId>
 

diff --git a/...t-starter/src/main/java/com/codingapi/springboot/framework/dto/request/SearchRequest.java b/...t-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<String> value) {
             Class<?> keyClass = getKeyType(key);
             pageRequest.addFilter(key, Relation.IN, value.stream()
-                    .map(v -> JSON.parseObject(v, keyClass))
+                    .map(v -> parseObject(v, keyClass))
                     .toArray()
             );
         }