diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/MPJAbstractWrapper.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/MPJAbstractWrapper.java index 668b1de..d137232 100644 --- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/MPJAbstractWrapper.java +++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/MPJAbstractWrapper.java @@ -667,12 +667,6 @@ public abstract class MPJAbstractWrapper ISqlSegment columnToSqlSegment(Integer index, SFunction column, boolean isJoin) { - PrefixEnum prefixEnum; - if (isMain) { - prefixEnum = isNo ? PrefixEnum.ON_FIRST /* 理论上不可能有这种情况 */ : PrefixEnum.CD_FIRST; - } else { - prefixEnum = isNo ? PrefixEnum.ON_FIRST : PrefixEnum.CD_ON_FIRST; - } return () -> columnToString(index, column, isJoin, isNo ? PrefixEnum.ON_FIRST : PrefixEnum.CD_FIRST); } diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/resultmap/MybatisLabel.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/resultmap/MybatisLabel.java index 8435dd0..db6e219 100644 --- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/resultmap/MybatisLabel.java +++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/resultmap/MybatisLabel.java @@ -246,6 +246,7 @@ public class MybatisLabel implements Label { mybatisLabel.resultList.addAll(listField.stream().map(i -> { Result result = new Result(); result.setId(i.isPk()); + result.setIndex(mybatisLabel.index); result.setProperty(i.getColumProperty()); result.setJavaType(i.getColumnType()); result.setJdbcType(Objects.isNull(i.getTableFieldInfo()) ? null : i.getTableFieldInfo().getJdbcType()); @@ -258,6 +259,7 @@ public class MybatisLabel implements Label { if (Objects.nonNull(field)) { Result result = new Result(); result.setId(s.isPk()); + result.setIndex(mybatisLabel.index); result.setProperty(s.getColumProperty()); result.setJavaType(field.getType()); result.setSelectNormal(s); 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 714a82a..472994e 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 @@ -713,7 +713,7 @@ class LambdaWrapperTest { MPJLambdaWrapper wrapper = new MPJLambdaWrapper() .leftJoin(AddressDO.class, AddressDO::getUserId, UserDO::getId) .leftJoin(AreaDO.class, AreaDO::getId, AddressDO::getAreaId); - Integer integer = userMapper.selectCount(wrapper); + Object integer = userMapper.selectCount(wrapper); ThreadLocalUtils.set("SELECT COUNT( * ) FROM `user` t LEFT JOIN address t1 ON (t1.user_id = t.id) LEFT JOIN area t2 ON (t2.id = t1.area_id) WHERE t.del=false AND t1.del=false AND t2.del=false"); MPJLambdaWrapper wrapper1 = new MPJLambdaWrapper()