|
@@ -17,11 +17,7 @@ package com.baomidou.mybatisplus.core.metadata;
|
|
|
|
|
|
import com.baomidou.mybatisplus.annotation.IdType;
|
|
|
import com.baomidou.mybatisplus.annotation.KeySequence;
|
|
|
-import com.baomidou.mybatisplus.core.toolkit.Assert;
|
|
|
-import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
|
|
|
-import com.baomidou.mybatisplus.core.toolkit.Constants;
|
|
|
-import com.baomidou.mybatisplus.core.toolkit.ExceptionUtils;
|
|
|
-import com.baomidou.mybatisplus.core.toolkit.StringUtils;
|
|
|
+import com.baomidou.mybatisplus.core.toolkit.*;
|
|
|
import com.baomidou.mybatisplus.core.toolkit.sql.SqlScriptUtils;
|
|
|
import lombok.AccessLevel;
|
|
|
import lombok.Data;
|
|
@@ -451,7 +447,7 @@ public class TableInfo implements Constants {
|
|
|
String id = currentNamespace + DOT + MYBATIS_PLUS + UNDERSCORE + entityType.getSimpleName();
|
|
|
List<ResultMapping> resultMappings = new ArrayList<>();
|
|
|
if (havePK()) {
|
|
|
- ResultMapping idMapping = new ResultMapping.Builder(configuration, keyProperty, keyColumn, keyType)
|
|
|
+ ResultMapping idMapping = new ResultMapping.Builder(configuration, keyProperty, StringUtils.getTargetColumn(keyColumn), keyType)
|
|
|
.flags(Collections.singletonList(ResultFlag.ID)).build();
|
|
|
resultMappings.add(idMapping);
|
|
|
}
|