From 54432b76a41003a1ff4dfa266ee8efcf1fba7e2b Mon Sep 17 00:00:00 2001
From: yulichang <570810310@qq.com>
Date: Mon, 12 Dec 2022 15:14:29 +0800
Subject: [PATCH] fix

---
 .../yulichang/wrapper/MPJAbstractLambdaWrapper.java      | 2 +-
 .../github/yulichang/test/join/mapper/MYBaseMapper.java  | 9 +++++++++
 .../github/yulichang/test/join/LambdaWrapperTest.java    | 8 ++++----
 3 files changed, 14 insertions(+), 5 deletions(-)
 create mode 100644 mybatis-plus-join-test/test-join/src/main/java/com/github/yulichang/test/join/mapper/MYBaseMapper.java

diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/MPJAbstractLambdaWrapper.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/MPJAbstractLambdaWrapper.java
index 2b10bbb..128b92c 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/MPJAbstractLambdaWrapper.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/MPJAbstractLambdaWrapper.java
@@ -65,7 +65,7 @@ public abstract class MPJAbstractLambdaWrapper<T, Children extends MPJAbstractLa
         }
         Table table = tableList.get(clazz, index);
         if (Objects.nonNull(table.getIndex())) {
-            if (isJoin) {
+            if (isJoin && clazz == getEntityClass()) {
                 //除自己以外的倒序第一个
                 Table t = tableList.getOrElse(clazz, index);
                 if (Objects.isNull(t.getIndex())) {
diff --git a/mybatis-plus-join-test/test-join/src/main/java/com/github/yulichang/test/join/mapper/MYBaseMapper.java b/mybatis-plus-join-test/test-join/src/main/java/com/github/yulichang/test/join/mapper/MYBaseMapper.java
new file mode 100644
index 0000000..c6c1603
--- /dev/null
+++ b/mybatis-plus-join-test/test-join/src/main/java/com/github/yulichang/test/join/mapper/MYBaseMapper.java
@@ -0,0 +1,9 @@
+package com.github.yulichang.test.join.mapper;
+
+import com.github.yulichang.base.MPJBaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+@SuppressWarnings("unused")
+public interface MYBaseMapper<T> extends MPJBaseMapper<T> {
+}
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 a2d6738..24564f6 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
@@ -143,20 +143,20 @@ class LambdaWrapperTest {
     @Test
     void testLogicDel() {
         List<UserDTO> l1 = userMapper.selectJoinList(UserDTO.class, new MPJLambdaWrapper<>());
-        assert l1.size() < 15;
+        assert l1.size() == 14;
 
         List<UserDTO> l2 = userMapper.selectJoinList(UserDTO.class, new MPJLambdaWrapper<UserDO>()
                 .selectAll(UserDO.class)
                 .select(AddressDO::getAddress)
                 .leftJoin(AddressDO.class, AddressDO::getUserId, UserDO::getId));
-        assert l2.size() < 11;
+        assert l2.size() == 10;
 
         List<UserDTO> l3 = userMapper.selectJoinList(UserDTO.class, new MPJLambdaWrapper<UserDO>()
                 .disableSubLogicDel()
                 .selectAll(UserDO.class)
                 .selectCollection(AddressDO.class, UserDTO::getAddressList)
                 .leftJoin(AddressDO.class, AddressDO::getUserId, UserDO::getId));
-        assert l3.size() > 5 && l3.get(0).getAddressList().size() > 5;
+        assert l3.size() == 14 && l3.get(0).getAddressList().size() == 9;
 
         List<UserDTO> l4 = userMapper.selectJoinList(UserDTO.class, new MPJLambdaWrapper<UserDO>()
                 .disableSubLogicDel()
@@ -165,7 +165,7 @@ class LambdaWrapperTest {
                 .leftJoin(AddressDO.class, on -> on
                         .eq(AddressDO::getUserId, UserDO::getId)
                         .eq(AddressDO::getDel, false)));
-        assert l4.size() > 5 && l4.get(0).getAddressList().size() <= 5;
+        assert l4.size() == 14 && l4.get(0).getAddressList().size() == 5;
     }