From e49ec138f2a720399f39f4385cd1176b36d3b4c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=B8=85?= <1474983351@qq.com>
Date: Thu, 3 Oct 2024 20:24:08 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=A9=BA=E6=8C=87?=
 =?UTF-8?q?=E9=92=88=E5=BC=82=E5=B8=B8=EF=BC=8C=E5=85=B3=E9=97=AD=20https:?=
 =?UTF-8?q?//gitee.com/mybatis-flex/mybatis-flex/issues/IAU28L=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mybatis/FlexDefaultResultSetHandler.java   | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

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