admin/mybatis-flex
1
0
Fork 0
mirror of https://gitee.com/mybatis-flex/mybatis-flex.git synced 2025-12-07 00:58:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: 用户 QueryWrapper 返回 null 值时，不进行属性查询。

Browse Source
This commit is contained in:
Suomm 2023-07-20 11:39:27 +08:00
parent 9fc8cf7976
commit 07aaaf353c
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
mybatis-flex-core/src/main/java/com/mybatisflex/core/field/FieldQueryManager.java
View File

@ -39,13 +39,25 @@ public class FieldQueryManager {
public static void queryFields(BaseMapper<?> mapper, Collection<?> entities, Map<String, FieldQuery> fieldQueryMap) {
for (Object entity : entities) {
if (entity == null) {
continue;
}
fieldQueryMap.forEach((key, fieldQuery) -> {
//不是当前类的内容
// 不是当前类的内容
if (!key.startsWith(entity.getClass().getName() + "#")) {
return;
}
@SuppressWarnings("unchecked")
QueryWrapper queryWrapper = fieldQuery.getQueryBuilder().build(entity);
// QueryWrapper 为 null 值时，不进行属性查询
if (queryWrapper == null) {
return;
}
Class<?> filedType = fieldQuery.getFieldWrapper().getFieldType();
Object value;
@ -73,9 +85,7 @@ public class FieldQueryManager {
Class<?> componentType = filedType.getComponentType();
List<?> objects = mapper.selectListByQueryAs(queryWrapper, componentType);
value = getArrayValue(componentType, objects);
}
// 实体类
else {
} else {
value = mapper.selectOneByQueryAs(queryWrapper, filedType);
// 循环查询嵌套类
if (!fieldQuery.isPrevent()) {