build: v1.6.3 release (^.^)YYa!!

mybatis-flex-annotation/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>parent</artifactId>
         <groupId>com.mybatis-flex</groupId>
-        <version>1.6.2</version>
+        <version>1.6.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

mybatis-flex-codegen/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>parent</artifactId>
         <groupId>com.mybatis-flex</groupId>
-        <version>1.6.2</version>
+        <version>1.6.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

mybatis-flex-core/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>parent</artifactId>
         <groupId>com.mybatis-flex</groupId>
-        <version>1.6.2</version>
+        <version>1.6.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

mybatis-flex-core/src/main/java/com/mybatisflex/core/FlexConsts.java

@@ -27,7 +27,7 @@ public class FlexConsts {
     }
 
     public static final String NAME = "MyBatis-Flex";
-    public static final String VERSION = "1.6.2";
+    public static final String VERSION = "1.6.3";
 
 
     public static final String SQL = "$$sql";

mybatis-flex-core/src/main/java/com/mybatisflex/core/mybatis/FlexResultSetHandler.java

@@ -65,7 +65,7 @@ public class FlexResultSetHandler extends FlexDefaultResultSetHandler {
     /**
      * 修复当实体类中存在 List<String> 或者 List<Integer> 等自动映射出错的问题
      * 本质问题应该出现 mybatis 判断有误
-     *
+     * <p>
      * https://gitee.com/mybatis-flex/mybatis-flex/issues/I7XBQS
      * https://gitee.com/mybatis-flex/mybatis-flex/issues/I7X7G7
      *
@@ -78,25 +78,23 @@ public class FlexResultSetHandler extends FlexDefaultResultSetHandler {
     protected Object createPrimitiveResultObject(ResultSetWrapper rsw, ResultMap resultMap, String columnPrefix)
         throws SQLException {
         final Class<?> resultType = resultMap.getType();
-        final String columnName;
-        final TypeHandler<?> typeHandler;
         if (!resultMap.getResultMappings().isEmpty()) {
             final List<ResultMapping> resultMappingList = resultMap.getResultMappings();
             final ResultMapping mapping = resultMappingList.get(0);
-            columnName = prependPrefix(mapping.getColumn(), columnPrefix);
+            String columnName = prependPrefix(mapping.getColumn(), columnPrefix);
-            typeHandler = mapping.getTypeHandler();
+            TypeHandler<?> typeHandler = mapping.getTypeHandler();
-        } else {
-            columnName = rsw.getColumnNames().get(0);
-            typeHandler = rsw.getTypeHandler(resultType, columnName);
-        }
 
             List<String> mappedColumnNames = rsw.getMappedColumnNames(resultMap, columnPrefix);
             if (columnName != null && mappedColumnNames.contains(columnName.toUpperCase(Locale.ENGLISH))) {
                 return typeHandler.getResult(rsw.getResultSet(), columnName);
             }
             return null;
+        } else {
+            String columnName = rsw.getColumnNames().get(0);
+            TypeHandler<?> typeHandler = rsw.getTypeHandler(resultType, columnName);
+            return typeHandler.getResult(rsw.getResultSet(), columnName);
+        }
     }
-
 
 
     static class FlexCursor<T> implements Cursor<T> {

mybatis-flex-dependencies/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.mybatis-flex</groupId>
         <artifactId>parent</artifactId>
-        <version>1.6.2</version>
+        <version>1.6.3</version>
     </parent>
 
     <artifactId>mybatis-flex-dependencies</artifactId>

mybatis-flex-processor/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>parent</artifactId>
         <groupId>com.mybatis-flex</groupId>
-        <version>1.6.2</version>
+        <version>1.6.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

mybatis-flex-solon-plugin/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>parent</artifactId>
         <groupId>com.mybatis-flex</groupId>
-        <version>1.6.2</version>
+        <version>1.6.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

mybatis-flex-spring-boot-starter/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>parent</artifactId>
         <groupId>com.mybatis-flex</groupId>
-        <version>1.6.2</version>
+        <version>1.6.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

mybatis-flex-spring/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>parent</artifactId>
         <groupId>com.mybatis-flex</groupId>
-        <version>1.6.2</version>
+        <version>1.6.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

mybatis-flex-test/mybatis-flex-native-test/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mybatis-flex-test</artifactId>
         <groupId>com.mybatis-flex</groupId>
-        <version>1.6.2</version>
+        <version>1.6.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

mybatis-flex-test/mybatis-flex-seata-test/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>mybatis-flex-test</artifactId>
 		<groupId>com.mybatis-flex</groupId>
-		<version>1.6.2</version>
+		<version>1.6.3</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 

mybatis-flex-test/mybatis-flex-spring-boot-test/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mybatis-flex-test</artifactId>
         <groupId>com.mybatis-flex</groupId>
-        <version>1.6.2</version>
+        <version>1.6.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

mybatis-flex-test/mybatis-flex-spring-cloud-test/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mybatis-flex-test</artifactId>
         <groupId>com.mybatis-flex</groupId>
-        <version>1.6.2</version>
+        <version>1.6.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

mybatis-flex-test/mybatis-flex-spring-test/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mybatis-flex-test</artifactId>
         <groupId>com.mybatis-flex</groupId>
-        <version>1.6.2</version>
+        <version>1.6.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

mybatis-flex-test/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>parent</artifactId>
         <groupId>com.mybatis-flex</groupId>
-        <version>1.6.2</version>
+        <version>1.6.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>