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

fix: 修复 ignore 属性也被加入 defaultQueryColumns 默认查询列。

Browse Source
This commit is contained in:
Suomm 2023-08-24 20:14:27 +08:00
parent c906936d03
commit 5829c8fb5b
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
mybatis-flex-core/src/main/java/com/mybatisflex/core/table/TableInfoFactory.java
View File

@ -209,11 +209,9 @@ public class TableInfoFactory {
for (Field field : entityFields) { for (Field field : entityFields) {
Column column = field.getAnnotation(Column.class); Column column = field.getAnnotation(Column.class);
// if (column != null && column.ignore()) {
// continue; // ignore
// }
Class<?> fieldType = reflector.getGetterType(field.getName()); Class<?> fieldType = reflector.getGetterType(field.getName());
if (ignoreColumnTypes.contains(fieldType)) { if (ignoreColumnTypes.contains(fieldType)) {
continue; continue;
} }
@ -223,6 +221,10 @@ public class TableInfoFactory {
&& !fieldType.isEnum() // 类型不是枚举 && !fieldType.isEnum() // 类型不是枚举
&& !defaultSupportColumnTypes.contains(fieldType) //默认的自动类型不包含该类型 && !defaultSupportColumnTypes.contains(fieldType) //默认的自动类型不包含该类型
) { ) {
// 忽略 集合 实体类 解析
if (column != null && column.ignore()) {
continue;
}
// 集合嵌套 // 集合嵌套
if (Collection.class.isAssignableFrom(fieldType)) { if (Collection.class.isAssignableFrom(fieldType)) {
Type genericType = TypeParameterResolver.resolveFieldType(field, entityClass); Type genericType = TypeParameterResolver.resolveFieldType(field, entityClass);
@ -289,10 +291,6 @@ public class TableInfoFactory {
largeColumns.add(columnName); largeColumns.add(columnName);
} }
if (column == null || !column.isLarge()) {
defaultQueryColumns.add(columnName);
}
Id id = field.getAnnotation(Id.class); Id id = field.getAnnotation(Id.class);
ColumnInfo columnInfo; ColumnInfo columnInfo;
if (id != null) { if (id != null) {
@ -323,6 +321,11 @@ public class TableInfoFactory {
columnInfo.setPropertyType(fieldType); columnInfo.setPropertyType(fieldType);
columnInfo.setIgnore(column != null && column.ignore()); columnInfo.setIgnore(column != null && column.ignore());
// 默认查询列 没有忽略且不是大字段
if (!columnInfo.isIgnore() && (column == null || !column.isLarge())) {
defaultQueryColumns.add(columnName);
}
if (column != null && column.typeHandler() != UnknownTypeHandler.class) { if (column != null && column.typeHandler() != UnknownTypeHandler.class) {
TypeHandler<?> typeHandler; TypeHandler<?> typeHandler;