lywsvip/hsweb-framework
1
0
Fork 0
mirror of https://github.com/hs-web/hsweb-framework.git synced 2026-06-06 14:15:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: 修复QueryHelper查询时无法使用父类字段

Browse Source
This commit is contained in:
zhouhao
2023-10-11 15:22:28 +08:00
parent 332c54e157
commit cfc324aae0
2 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
hsweb-commons/hsweb-commons-crud/src/main/java/org/hswebframework/web/crud/query/DefaultQueryHelper.java
View File

@@ -37,6 +37,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.core.ResolvableType;
import org.springframework.core.annotation.AnnotatedElementUtils;
import org.springframework.util.ReflectionUtils;
import org.springframework.util.StringUtils;
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;
@@ -44,6 +45,7 @@ import reactor.util.context.Context;
import reactor.util.context.ContextView;
import javax.persistence.Table;
import java.lang.reflect.Field;
import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
import java.util.function.Consumer;
@@ -318,7 +320,11 @@ public class DefaultQueryHelper implements QueryHelper {
this.tableType = tableType;
this.targetProperty = setter == null ? null : MethodReferenceConverter.convertToColumn(setter);
if (this.targetProperty != null) {
propertyType = ResolvableType.forField(parent.clazz.getDeclaredField(targetProperty), parent.clazz);
Field field = ReflectionUtils.findField(parent.clazz, targetProperty);
if (field == null) {
throw new NoSuchFieldException(parent.clazz.getName() + "." + targetProperty);
}
propertyType = ResolvableType.forField(field, parent.clazz);
} else {
propertyType = null;
}

11
hsweb-commons/hsweb-commons-crud/src/test/java/org/hswebframework/web/crud/query/DefaultQueryHelperTest.java
View File

@@ -65,7 +65,7 @@ class DefaultQueryHelperTest {
.insert("s_test")
.value("id", "inner-test")
.value("name", "inner")
.value("testName","inner")
.value("testName", "inner")
.value("age", 31)
.execute()
.sync();
@@ -159,7 +159,7 @@ class DefaultQueryHelperTest {
public void testCustomFirstPageIndex() {
DefaultQueryHelper helper = new DefaultQueryHelper(database);
QueryParamEntity e = new QueryParamEntity();
e.and("id","eq","testCustomFirstPageIndex");
e.and("id", "eq", "testCustomFirstPageIndex");
e.setFirstPageIndex(1);
e.setPageIndex(2);
@@ -243,7 +243,7 @@ class DefaultQueryHelperTest {
@Getter
@Setter
@ToString
public static class TestInfo {
public static class TestInfo extends TestInfoSuper {
private String id;
@@ -255,6 +255,11 @@ class DefaultQueryHelperTest {
private EventTestEntity event;
}
@Getter
@Setter
public static class TestInfoSuper {
private List<EventTestEntity> eventList;
}
}