Merge pull request #3635 from zyzyzy523/revert-3587-3.0

Revert "perf:优化MybatisConfiguration#checkGloballyForDiscriminatedNestedResultMaps"

mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/MybatisConfiguration.java

@@ -315,8 +315,9 @@ public class MybatisConfiguration extends Configuration {
     protected void checkGloballyForDiscriminatedNestedResultMaps(ResultMap rm) {
         if (rm.hasNestedResultMaps()) {
             for (Map.Entry<String, ResultMap> entry : resultMaps.entrySet()) {
-                ResultMap entryResultMap = entry.getValue();
-                if (entryResultMap != null) {
+                Object value = entry.getValue();
+                if (value instanceof ResultMap) {
+                    ResultMap entryResultMap = (ResultMap) value;
                     if (!entryResultMap.hasNestedResultMaps() && entryResultMap.getDiscriminator() != null) {
                         Collection<String> discriminatedResultMapNames = entryResultMap.getDiscriminator().getDiscriminatorMap().values();
                         if (discriminatedResultMapNames.contains(rm.getId())) {
@@ -383,7 +384,7 @@ public class MybatisConfiguration extends Configuration {
                     if (super.get(shortKey) == null) {
                         super.put(shortKey, value);
                     } else {
-                        super.put(shortKey, (V) new Ambiguity(shortKey));
+                        super.put(shortKey, (V) new StrictMap.Ambiguity(shortKey));
                     }
                 }
             }