From 9fc8860b112b909982d1e95ddc299d62a8243fbc Mon Sep 17 00:00:00 2001
From: admin <570810310@qq.com>
Date: Tue, 2 Feb 2021 16:10:06 +0800
Subject: [PATCH] update

---
 src/main/java/com/github/mybatisplus/base/MyBaseMapper.java    | 1 +
 src/main/java/com/github/mybatisplus/base/MyBaseService.java   | 1 +
 .../java/com/github/mybatisplus/base/MyBaseServiceImpl.java    | 1 +
 .../github/mybatisplus/interceptor/MyResultInterceptor.java    | 3 +++
 4 files changed, 6 insertions(+)

diff --git a/src/main/java/com/github/mybatisplus/base/MyBaseMapper.java b/src/main/java/com/github/mybatisplus/base/MyBaseMapper.java
index b9e457f..2eb7568 100644
--- a/src/main/java/com/github/mybatisplus/base/MyBaseMapper.java
+++ b/src/main/java/com/github/mybatisplus/base/MyBaseMapper.java
@@ -3,6 +3,7 @@ package com.github.mybatisplus.base;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.github.mybatisplus.interfaces.BaseJoin;
 import com.github.mybatisplus.toolkit.Constant;
 import org.apache.ibatis.annotations.Param;
 
diff --git a/src/main/java/com/github/mybatisplus/base/MyBaseService.java b/src/main/java/com/github/mybatisplus/base/MyBaseService.java
index 08ae6c7..f8aec54 100644
--- a/src/main/java/com/github/mybatisplus/base/MyBaseService.java
+++ b/src/main/java/com/github/mybatisplus/base/MyBaseService.java
@@ -2,6 +2,7 @@ package com.github.mybatisplus.base;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.github.mybatisplus.interfaces.BaseJoin;
 
 import java.util.List;
 import java.util.Map;
diff --git a/src/main/java/com/github/mybatisplus/base/MyBaseServiceImpl.java b/src/main/java/com/github/mybatisplus/base/MyBaseServiceImpl.java
index 3fed81e..7444a49 100644
--- a/src/main/java/com/github/mybatisplus/base/MyBaseServiceImpl.java
+++ b/src/main/java/com/github/mybatisplus/base/MyBaseServiceImpl.java
@@ -2,6 +2,7 @@ package com.github.mybatisplus.base;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.mybatisplus.interfaces.BaseJoin;
 
 import java.util.List;
 import java.util.Map;
diff --git a/src/main/java/com/github/mybatisplus/interceptor/MyResultInterceptor.java b/src/main/java/com/github/mybatisplus/interceptor/MyResultInterceptor.java
index a42d855..e866217 100644
--- a/src/main/java/com/github/mybatisplus/interceptor/MyResultInterceptor.java
+++ b/src/main/java/com/github/mybatisplus/interceptor/MyResultInterceptor.java
@@ -84,6 +84,9 @@ public class MyResultInterceptor implements Interceptor {
             }
             if (object instanceof Map) {
                 Map<?, ?> args = (Map<?, ?>) object;
+                if (!args.containsValue(Constant.CLAZZ)) {
+                    return null;
+                }
                 return (Class<?>) args.get(Constant.CLAZZ);
             }
             return null;