From d3d9509a1b8475df69cae2f6d2b11e0e3d9bf579 Mon Sep 17 00:00:00 2001
From: xlorne <1991wangliang@gmail.com>
Date: Mon, 29 Jan 2024 10:46:07 +0800
Subject: [PATCH] fix #38

---
 pom.xml                                               |  4 ++--
 springboot-starter-data-fast/pom.xml                  |  2 +-
 springboot-starter-security-jwt/pom.xml               |  2 +-
 springboot-starter/pom.xml                            |  2 +-
 .../framework/dto/request/SearchRequest.java          | 11 +++++++++--
 5 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/pom.xml b/pom.xml
index 8c42cd10..0b05f8e4 100644
--- 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
index 17764984..1026a173 100644
--- 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
index 847a8db9..9fb6e94f 100644
--- 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
index 43dfc218..432a5763 100644
--- 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/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<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()
             );
         }