Merge pull request #201 from natsufumij/main

修复:当构造函数字段顺序与数据库字段定义顺序不一致时可能出现的映射失败的问题
This commit is contained in:
Michael Yang 2023-11-11 17:16:14 +08:00 committed by GitHub
commit c899a7af35
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -15,6 +15,7 @@
*/ */
package com.mybatisflex.core.mybatis; package com.mybatisflex.core.mybatis;
import com.mybatisflex.core.util.StringUtil;
import org.apache.ibatis.annotations.AutomapConstructor; import org.apache.ibatis.annotations.AutomapConstructor;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.binding.MapperMethod.ParamMap; import org.apache.ibatis.binding.MapperMethod.ParamMap;
@ -767,7 +768,8 @@ public class FlexDefaultResultSetHandler extends DefaultResultSetHandler {
List<Object> constructorArgs, Constructor<?> constructor, boolean foundValues) throws SQLException { List<Object> constructorArgs, Constructor<?> constructor, boolean foundValues) throws SQLException {
for (int i = 0; i < constructor.getParameterTypes().length; i++) { for (int i = 0; i < constructor.getParameterTypes().length; i++) {
Class<?> parameterType = constructor.getParameterTypes()[i]; Class<?> parameterType = constructor.getParameterTypes()[i];
String columnName = rsw.getColumnNames().get(i); Parameter parameter = constructor.getParameters()[i];
String columnName = StringUtil.camelToUnderline(parameter.getName());
TypeHandler<?> typeHandler = rsw.getTypeHandler(parameterType, columnName); TypeHandler<?> typeHandler = rsw.getTypeHandler(parameterType, columnName);
Object value = typeHandler.getResult(rsw.getResultSet(), columnName); Object value = typeHandler.getResult(rsw.getResultSet(), columnName);
constructorArgTypes.add(parameterType); constructorArgTypes.add(parameterType);