调整判断逻辑顺序

baomidou · Aug 25, 2019 · 97fc7b1 · 97fc7b1
1 parent d836b6f
commit 97fc7b1
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/metadata/TableInfo.java b/mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/metadata/TableInfo.java
@@ -361,7 +361,7 @@ protected String formatLogicDeleteSql(TableFieldInfo field, boolean deleteValue)
      * 自动构建 resultMap 并注入(如果条件符合的话)
      */
     void initResultMapIfNeed() {
-        if (resultMap == null && autoInitResultMap) {
+        if (autoInitResultMap && null == resultMap) {
             String id = currentNamespace + DOT + MYBATIS_PLUS + UNDERSCORE + entityType.getSimpleName();
             List<ResultMapping> resultMappings = new ArrayList<>();
             if (keyType != null) {