From 516c6a24d63432f87bf6ece09c914a8f73166a6c Mon Sep 17 00:00:00 2001
From: yulichang <570810310@qq.com>
Date: Mon, 27 Feb 2023 17:54:59 +0800
Subject: [PATCH] fix
 https://gitee.com/best_handsome/mybatis-plus-join/issues/I6I09Y

---
 .../yulichang/interceptor/MPJInterceptor.java   |  6 +++---
 .../yulichang/toolkit/MPJReflectionKit.java     | 16 ++++++++++++++++
 .../github/yulichang/test/join/entity/ID.java   | 16 ++++++++++++++++
 .../yulichang/test/join/entity/UserDO.java      |  8 ++------
 .../yulichang/test/join/entity/UserTTT.java     |  4 ++++
 .../yulichang/test/join/LambdaWrapperTest.java  | 17 +++++++++++++----
 6 files changed, 54 insertions(+), 13 deletions(-)
 create mode 100644 mybatis-plus-join-test/test-join/src/main/java/com/github/yulichang/test/join/entity/ID.java
 create mode 100644 mybatis-plus-join-test/test-join/src/main/java/com/github/yulichang/test/join/entity/UserTTT.java

diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/interceptor/MPJInterceptor.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/interceptor/MPJInterceptor.java
index 25f9cd9..de31730 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/interceptor/MPJInterceptor.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/interceptor/MPJInterceptor.java
@@ -163,7 +163,7 @@ public class MPJInterceptor implements Interceptor {
             return result;
         }
         MPJLambdaWrapper wrapper = (MPJLambdaWrapper) obj;
-        Map<String, Field> fieldMap = ReflectionKit.getFieldMap(resultType);
+        Map<String, Field> fieldMap = MPJReflectionKit.getFieldMap(resultType);
         List<Select> columnList = wrapper.getSelectColumns();
         //移除对多查询列，为了可重复使用wrapper
         columnList.removeIf(Select::isLabel);
@@ -175,7 +175,7 @@ public class MPJInterceptor implements Interceptor {
                 columnSet.add(i.getAlias());
                 if (Objects.nonNull(field)) {
                     ResultMapping.Builder builder = new ResultMapping.Builder(ms.getConfiguration(), i.getAlias(),
-                            i.getAlias(), field.getType());
+                            i.getAlias(), MPJReflectionKit.getFieldType(resultType, i.getAlias()));
                     resultMappings.add(selectToResult(wrapper.getEntityClass(), i, field.getType(), builder));
                 }
             } else {
@@ -183,7 +183,7 @@ public class MPJInterceptor implements Interceptor {
                 columnSet.add(i.getTagColumn());
                 if (Objects.nonNull(field)) {
                     ResultMapping.Builder builder = new ResultMapping.Builder(ms.getConfiguration(), i.getColumProperty(),
-                            i.getTagColumn(), field.getType());
+                            i.getTagColumn(), MPJReflectionKit.getFieldType(resultType, i.getColumProperty()));
                     resultMappings.add(selectToResult(wrapper.getEntityClass(), i, field.getType(), builder));
                 }
             }
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/MPJReflectionKit.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/MPJReflectionKit.java
index 3756b08..5a20d49 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/MPJReflectionKit.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/MPJReflectionKit.java
@@ -1,6 +1,7 @@
 package com.github.yulichang.toolkit;
 
 import com.baomidou.mybatisplus.core.toolkit.Assert;
+import org.apache.ibatis.reflection.Reflector;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.ParameterizedType;
@@ -22,6 +23,9 @@ public final class MPJReflectionKit {
 
     private static final Map<Class<?>, Map<String, Field>> CLASS_FIELD_CACHE = new ConcurrentHashMap<>();
 
+    //mybatis 缓存
+    private static final Map<Class<?>, Reflector> CLASS_REFLECTOR_CACHE = new ConcurrentHashMap<>();
+
     private static final Map<String, Field> EMPTY_MAP = new HashMap<>();
 
 
@@ -86,6 +90,18 @@ public final class MPJReflectionKit {
         return map;
     }
 
+    public static Class<?> getFieldType(Class<?> clazz, String name) {
+        if (clazz == null) {
+            return null;
+        }
+        Reflector reflector = CLASS_REFLECTOR_CACHE.computeIfAbsent(clazz, Reflector::new);
+        Class<?> getterType = reflector.getGetterType(name);
+        if (getterType != null) {
+            return getterType;
+        }
+        return getFieldMap(clazz).get(name).getType();
+    }
+
     public static boolean isPrimitiveOrWrapper(Class<?> clazz) {
         Assert.notNull(clazz, "Class must not be null");
         return (clazz.isPrimitive() || PRIMITIVE_WRAPPER_TYPE_MAP.containsKey(clazz));
diff --git a/mybatis-plus-join-test/test-join/src/main/java/com/github/yulichang/test/join/entity/ID.java b/mybatis-plus-join-test/test-join/src/main/java/com/github/yulichang/test/join/entity/ID.java
new file mode 100644
index 0000000..32b781e
--- /dev/null
+++ b/mybatis-plus-join-test/test-join/src/main/java/com/github/yulichang/test/join/entity/ID.java
@@ -0,0 +1,16 @@
+package com.github.yulichang.test.join.entity;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.io.Serializable;
+
+public class ID<T extends Serializable> extends Model<ID<T>> {
+
+    @Getter
+    @Setter
+    @TableId
+    private T id;
+}
diff --git a/mybatis-plus-join-test/test-join/src/main/java/com/github/yulichang/test/join/entity/UserDO.java b/mybatis-plus-join-test/test-join/src/main/java/com/github/yulichang/test/join/entity/UserDO.java
index 540cfdd..58e4e34 100644
--- a/mybatis-plus-join-test/test-join/src/main/java/com/github/yulichang/test/join/entity/UserDO.java
+++ b/mybatis-plus-join-test/test-join/src/main/java/com/github/yulichang/test/join/entity/UserDO.java
@@ -1,7 +1,6 @@
 package com.github.yulichang.test.join.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
@@ -19,12 +18,9 @@ import java.util.Map;
 @Data
 @ToString
 @Accessors(chain = true)
-@EqualsAndHashCode
+@EqualsAndHashCode(callSuper = true)
 @TableName(value = "`user`", autoResultMap = true)
-public class UserDO implements Serializable {
-
-    @TableId
-    private Integer id;
+public class UserDO extends ID<Integer> implements Serializable {
 
     private Integer pid;
 
diff --git a/mybatis-plus-join-test/test-join/src/main/java/com/github/yulichang/test/join/entity/UserTTT.java b/mybatis-plus-join-test/test-join/src/main/java/com/github/yulichang/test/join/entity/UserTTT.java
new file mode 100644
index 0000000..c7151c3
--- /dev/null
+++ b/mybatis-plus-join-test/test-join/src/main/java/com/github/yulichang/test/join/entity/UserTTT.java
@@ -0,0 +1,4 @@
+package com.github.yulichang.test.join.entity;
+
+public class UserTTT extends UserDO{
+}
diff --git a/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/LambdaWrapperTest.java b/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/LambdaWrapperTest.java
index 3091fbd..34935c8 100644
--- a/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/LambdaWrapperTest.java
+++ b/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/LambdaWrapperTest.java
@@ -6,10 +6,7 @@ import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.yulichang.test.join.dto.AddressDTO;
 import com.github.yulichang.test.join.dto.UserDTO;
-import com.github.yulichang.test.join.entity.AddressDO;
-import com.github.yulichang.test.join.entity.AreaDO;
-import com.github.yulichang.test.join.entity.UserDO;
-import com.github.yulichang.test.join.entity.UserDto;
+import com.github.yulichang.test.join.entity.*;
 import com.github.yulichang.test.join.mapper.UserDTOMapper;
 import com.github.yulichang.test.join.mapper.UserMapper;
 import com.github.yulichang.test.util.ThreadLocalUtils;
@@ -684,4 +681,16 @@ class LambdaWrapperTest {
         List<UserDO> dos = userMapper.selectJoinList(UserDO.class, wrapper);
         System.out.println(1);
     }
+
+    /**
+     * 泛型测试
+     */
+    @Test
+    void testGeneric() {
+        MPJLambdaWrapper<UserDO> wrapper = new MPJLambdaWrapper<UserDO>()
+                .selectAll(UserDO.class)
+                .le(UserDO::getId, 10000)
+                .orderByDesc(UserDO::getId);
+        List<UserTTT> list = userMapper.selectJoinList(UserTTT.class, wrapper);
+    }
 }