third_codes/mybatis-plus-join
1
0
Fork 0
mirror of https://gitee.com/best_handsome/mybatis-plus-join synced 2025-07-11 00:02:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

代码优化

Browse Source
This commit is contained in:
yulichang 2023-03-16 19:58:28 +08:00
parent 4211d02855
commit 14ae83aff5
3 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/MPJAbstractWrapper.java
View File

@ -667,12 +667,6 @@ public abstract class MPJAbstractWrapper<T, Children extends MPJAbstractWrapper<
* 获取 columnName * 获取 columnName
*/ */
protected final <X> ISqlSegment columnToSqlSegment(Integer index, SFunction<X, ?> column, boolean isJoin) { protected final <X> ISqlSegment columnToSqlSegment(Integer index, SFunction<X, ?> 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); return () -> columnToString(index, column, isJoin, isNo ? PrefixEnum.ON_FIRST : PrefixEnum.CD_FIRST);
} }

2
mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/resultmap/MybatisLabel.java
View File

@ -246,6 +246,7 @@ public class MybatisLabel<E, T> implements Label<T> {
mybatisLabel.resultList.addAll(listField.stream().map(i -> { mybatisLabel.resultList.addAll(listField.stream().map(i -> {
Result result = new Result(); Result result = new Result();
result.setId(i.isPk()); result.setId(i.isPk());
result.setIndex(mybatisLabel.index);
result.setProperty(i.getColumProperty()); result.setProperty(i.getColumProperty());
result.setJavaType(i.getColumnType()); result.setJavaType(i.getColumnType());
result.setJdbcType(Objects.isNull(i.getTableFieldInfo()) ? null : i.getTableFieldInfo().getJdbcType()); result.setJdbcType(Objects.isNull(i.getTableFieldInfo()) ? null : i.getTableFieldInfo().getJdbcType());
@ -258,6 +259,7 @@ public class MybatisLabel<E, T> implements Label<T> {
if (Objects.nonNull(field)) { if (Objects.nonNull(field)) {
Result result = new Result(); Result result = new Result();
result.setId(s.isPk()); result.setId(s.isPk());
result.setIndex(mybatisLabel.index);
result.setProperty(s.getColumProperty()); result.setProperty(s.getColumProperty());
result.setJavaType(field.getType()); result.setJavaType(field.getType());
result.setSelectNormal(s); result.setSelectNormal(s);

2
mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/LambdaWrapperTest.java
View File

@ -713,7 +713,7 @@ class LambdaWrapperTest {
MPJLambdaWrapper<UserDO> wrapper = new MPJLambdaWrapper<UserDO>() MPJLambdaWrapper<UserDO> wrapper = new MPJLambdaWrapper<UserDO>()
.leftJoin(AddressDO.class, AddressDO::getUserId, UserDO::getId) .leftJoin(AddressDO.class, AddressDO::getUserId, UserDO::getId)
.leftJoin(AreaDO.class, AreaDO::getId, AddressDO::getAreaId); .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"); 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<UserDO> wrapper1 = new MPJLambdaWrapper<UserDO>() MPJLambdaWrapper<UserDO> wrapper1 = new MPJLambdaWrapper<UserDO>()