diff --git a/mybatis-flex-core/src/main/java/com/mybatisflex/core/mybatis/FlexDefaultResultSetHandler.java b/mybatis-flex-core/src/main/java/com/mybatisflex/core/mybatis/FlexDefaultResultSetHandler.java index 2c8dcdb1..578a8dad 100644 --- a/mybatis-flex-core/src/main/java/com/mybatisflex/core/mybatis/FlexDefaultResultSetHandler.java +++ b/mybatis-flex-core/src/main/java/com/mybatisflex/core/mybatis/FlexDefaultResultSetHandler.java @@ -479,7 +479,7 @@ public class FlexDefaultResultSetHandler extends DefaultResultSetHandler { private boolean applyPropertyMappings(ResultSetWrapper rsw, ResultMap resultMap, MetaObject metaObject, ResultLoaderMap lazyLoader, String columnPrefix) throws SQLException { - final List mappedColumnNames = rsw.getMappedColumnNames(resultMap, columnPrefix); + final Collection mappedColumnNames = rsw.getMappedColumnNames(resultMap, columnPrefix); boolean foundValues = false; final List propertyMappings = resultMap.getPropertyResultMappings(); for (ResultMapping propertyMapping : propertyMappings) { @@ -1178,7 +1178,7 @@ public class FlexDefaultResultSetHandler extends DefaultResultSetHandler { if (resultMapping.isSimple()) { final String column = prependPrefix(resultMapping.getColumn(), columnPrefix); final TypeHandler th = resultMapping.getTypeHandler(); - List mappedColumnNames = rsw.getMappedColumnNames(resultMap, columnPrefix); + Collection mappedColumnNames = rsw.getMappedColumnNames(resultMap, columnPrefix); // Issue #114 if (column != null && mappedColumnNames.contains(column.toUpperCase(Locale.ENGLISH))) { final Object value = th.getResult(rsw.getResultSet(), column); diff --git a/mybatis-flex-core/src/main/java/com/mybatisflex/core/mybatis/FlexResultSetHandler.java b/mybatis-flex-core/src/main/java/com/mybatisflex/core/mybatis/FlexResultSetHandler.java index f38c1c9a..7678b1c3 100644 --- a/mybatis-flex-core/src/main/java/com/mybatisflex/core/mybatis/FlexResultSetHandler.java +++ b/mybatis-flex-core/src/main/java/com/mybatisflex/core/mybatis/FlexResultSetHandler.java @@ -30,6 +30,7 @@ import org.apache.ibatis.type.TypeHandler; import java.sql.SQLException; import java.sql.Statement; +import java.util.Collection; import java.util.Iterator; import java.util.List; import java.util.Locale; @@ -84,7 +85,7 @@ public class FlexResultSetHandler extends FlexDefaultResultSetHandler { String columnName = prependPrefix(mapping.getColumn(), columnPrefix); TypeHandler typeHandler = mapping.getTypeHandler(); - List mappedColumnNames = rsw.getMappedColumnNames(resultMap, columnPrefix); + Collection mappedColumnNames = rsw.getMappedColumnNames(resultMap, columnPrefix); if (columnName != null && mappedColumnNames.contains(columnName.toUpperCase(Locale.ENGLISH))) { return typeHandler.getResult(rsw.getResultSet(), columnName); }