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: 修复空指针异常，关闭 https://gitee.com/mybatis-flex/mybatis-flex/issues/IAU28L。

Browse Source
This commit is contained in:
王帅 2024-10-03 20:24:08 +08:00
parent f19f8f4f0e
commit e49ec138f2
1 changed files with 6 additions and 12 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/mybatis/FlexDefaultResultSetHandler.java
View File

@ -593,9 +593,8 @@ public class FlexDefaultResultSetHandler extends DefaultResultSetHandler {
metaObject.setValue(mapping.property, value); metaObject.setValue(mapping.property, value);
} }
} }
} } else {
else { if (FlexGlobalConfig.getUnMappedColumnHandler() != null) {
if (FlexGlobalConfig.getUnMappedColumnHandler() != null){
// 增加未匹配列自定义处理 // 增加未匹配列自定义处理
final List<String> unmappedColumnNames = rsw.getUnmappedColumnNames(resultMap, columnPrefix); final List<String> unmappedColumnNames = rsw.getUnmappedColumnNames(resultMap, columnPrefix);
for (String unmappedColumnName : unmappedColumnNames) { for (String unmappedColumnName : unmappedColumnNames) {
@ -967,15 +966,10 @@ public class FlexDefaultResultSetHandler extends DefaultResultSetHandler {
private Object prepareSimpleKeyParameter(ResultSet rs, ResultMapping resultMapping, Class<?> parameterType, private Object prepareSimpleKeyParameter(ResultSet rs, ResultMapping resultMapping, Class<?> parameterType,
String columnPrefix) throws SQLException { String columnPrefix) throws SQLException {
// final TypeHandler<?> typeHandler; final TypeHandler<?> typeHandler;
// if (typeHandlerRegistry.hasTypeHandler(parameterType)) { if (typeHandlerRegistry.hasTypeHandler(parameterType)) {
// typeHandler = typeHandlerRegistry.getTypeHandler(parameterType); typeHandler = typeHandlerRegistry.getTypeHandler(parameterType);
// } else { } else {
// typeHandler = typeHandlerRegistry.getUnknownTypeHandler();
// }
TypeHandler<?> typeHandler = typeHandlerRegistry.getTypeHandler(parameterType);
if (typeHandler == null) {
typeHandler = typeHandlerRegistry.getUnknownTypeHandler(); typeHandler = typeHandlerRegistry.getUnknownTypeHandler();
} }
return typeHandler.getResult(rs, prependPrefix(resultMapping.getColumn(), columnPrefix)); return typeHandler.getResult(rs, prependPrefix(resultMapping.getColumn(), columnPrefix));