From ed34d29cafd34cc653797341a220cba0121ec056 Mon Sep 17 00:00:00 2001 From: hocgin Date: Mon, 16 May 2022 19:21:07 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=96=B0=E5=A2=9E=E5=8A=9F=E8=83=BD](develop)?= =?UTF-8?q?:=20=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/struct/basic/AbstractServiceImpl.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/spring-boot-mybatis-plus/mybatis-plus-spring-boot-autoconfigure/src/main/java/in/hocg/boot/mybatis/plus/autoconfiguration/core/struct/basic/AbstractServiceImpl.java b/spring-boot-mybatis-plus/mybatis-plus-spring-boot-autoconfigure/src/main/java/in/hocg/boot/mybatis/plus/autoconfiguration/core/struct/basic/AbstractServiceImpl.java index 385d8279..f5ca7961 100644 --- a/spring-boot-mybatis-plus/mybatis-plus-spring-boot-autoconfigure/src/main/java/in/hocg/boot/mybatis/plus/autoconfiguration/core/struct/basic/AbstractServiceImpl.java +++ b/spring-boot-mybatis-plus/mybatis-plus-spring-boot-autoconfigure/src/main/java/in/hocg/boot/mybatis/plus/autoconfiguration/core/struct/basic/AbstractServiceImpl.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.support.SFunction; -import com.baomidou.mybatisplus.extension.conditions.query.QueryChainWrapper; +import com.baomidou.mybatisplus.extension.conditions.query.ChainQuery; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import in.hocg.boot.mybatis.plus.autoconfiguration.core.enhance.convert.UseConvert; @@ -16,7 +16,10 @@ import java.io.Serializable; import java.lang.reflect.Method; -import java.util.*; +import java.util.Arrays; +import java.util.List; +import java.util.Objects; +import java.util.Optional; import java.util.stream.Collectors; /** @@ -72,8 +75,8 @@ public Optional first(Wrapper queryWrapper) { public List limit(Wrapper queryWrapper, Integer limit) { Page limitPage = new Page<>(1, limit, false); - if (queryWrapper instanceof QueryChainWrapper) { - return ((QueryChainWrapper) queryWrapper).page(limitPage).getRecords(); + if (queryWrapper instanceof ChainQuery) { + return ((ChainQuery) queryWrapper).page(limitPage).getRecords(); } return page(limitPage, queryWrapper).getRecords(); }