Skip to content

Commit

Permalink
Merge pull request #105 from hocgin/develop
Browse files Browse the repository at this point in the history
[新增功能](develop): 优化
  • Loading branch information
hocgin authored May 16, 2022
2 parents 82c46b7 + ed34d29 commit 3ba5faa
Showing 1 changed file with 7 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;

/**
Expand Down Expand Up @@ -72,8 +75,8 @@ public Optional<T> first(Wrapper<T> queryWrapper) {
public List<T> limit(Wrapper<T> queryWrapper, Integer limit) {
Page<T> limitPage = new Page<>(1, limit, false);

if (queryWrapper instanceof QueryChainWrapper) {
return ((QueryChainWrapper<T>) queryWrapper).page(limitPage).getRecords();
if (queryWrapper instanceof ChainQuery) {
return ((ChainQuery<T>) queryWrapper).page(limitPage).getRecords();
}
return page(limitPage, queryWrapper).getRecords();
}
Expand Down

0 comments on commit 3ba5faa

Please sign in to comment.