Skip to content

Commit 592a579

Browse files
committed
1 parent 94ffabc commit 592a579

File tree

5 files changed

+13
-6
lines changed

5 files changed

+13
-6
lines changed

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
<groupId>com.codingapi.springboot</groupId>
1414
<artifactId>springboot-parent</artifactId>
15-
<version>2.7.9</version>
15+
<version>2.7.10.dev</version>
1616

1717
<url>https://github.com/codingapi/springboot-framewrok</url>
1818
<name>springboot-parent</name>

springboot-starter-data-fast/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>springboot-parent</artifactId>
77
<groupId>com.codingapi.springboot</groupId>
8-
<version>2.7.9</version>
8+
<version>2.7.10.dev</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

springboot-starter-security-jwt/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<artifactId>springboot-parent</artifactId>
88
<groupId>com.codingapi.springboot</groupId>
9-
<version>2.7.9</version>
9+
<version>2.7.10.dev</version>
1010
</parent>
1111

1212
<artifactId>springboot-starter-security-jwt</artifactId>

springboot-starter/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>com.codingapi.springboot</groupId>
77
<artifactId>springboot-parent</artifactId>
8-
<version>2.7.9</version>
8+
<version>2.7.10.dev</version>
99
</parent>
1010
<artifactId>springboot-starter</artifactId>
1111

springboot-starter/src/main/java/com/codingapi/springboot/framework/dto/request/SearchRequest.java

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,14 +87,21 @@ public ClassContent(Class<?> clazz, PageRequest pageRequest) {
8787

8888
public void addFilter(String key, String value) {
8989
Class<?> keyClass = getKeyType(key);
90-
Object v = JSON.parseObject(value, keyClass);
90+
Object v = parseObject(value, keyClass);
9191
pageRequest.addFilter(key, Relation.EQUAL, v);
9292
}
9393

94+
private Object parseObject(String value, Class<?> keyClass) {
95+
if(value.getClass().equals(keyClass)) {
96+
return value;
97+
}
98+
return JSON.parseObject(value, keyClass);
99+
}
100+
94101
public void addFilter(String key, List<String> value) {
95102
Class<?> keyClass = getKeyType(key);
96103
pageRequest.addFilter(key, Relation.IN, value.stream()
97-
.map(v -> JSON.parseObject(v, keyClass))
104+
.map(v -> parseObject(v, keyClass))
98105
.toArray()
99106
);
100107
}

0 commit comments

Comments
 (0)