去除不再需要的方法

mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/toolkit/sql/SqlHelper.java

@@ -15,8 +15,11 @@
  */
 package com.baomidou.mybatisplus.core.toolkit.sql;
 
-import java.util.List;
-
+import com.baomidou.mybatisplus.core.metadata.TableInfo;
+import com.baomidou.mybatisplus.core.toolkit.Assert;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.core.toolkit.GlobalConfigUtils;
+import com.baomidou.mybatisplus.core.toolkit.TableInfoHelper;
 import org.apache.ibatis.logging.Log;
 import org.apache.ibatis.logging.LogFactory;
 import org.apache.ibatis.session.ExecutorType;
@@ -24,16 +27,7 @@ import org.apache.ibatis.session.SqlSession;
 import org.apache.ibatis.session.SqlSessionFactory;
 import org.mybatis.spring.SqlSessionUtils;
 
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.metadata.TableInfo;
-import com.baomidou.mybatisplus.core.toolkit.ArrayUtils;
-import com.baomidou.mybatisplus.core.toolkit.Assert;
-import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
-import com.baomidou.mybatisplus.core.toolkit.GlobalConfigUtils;
-import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
-import com.baomidou.mybatisplus.core.toolkit.TableInfoHelper;
+import java.util.List;
 
 /**
  * <p>
@@ -78,7 +72,7 @@ public final class SqlHelper {
      * 获取Session
      * </p>
      *
-     * @param clazz      实体类
+     * @param clazz 实体类
      * @return SqlSession
      */
     public static SqlSession sqlSession(Class<?> clazz) {
@@ -154,42 +148,4 @@ public final class SqlHelper {
         }
         return null;
     }
-
-    /**
-     * <p>
-     * 填充Wrapper
-     * </p>
-     *
-     * @param page    分页对象
-     * @param wrapper SQL包装对象
-     */
-    @SuppressWarnings("unchecked")
-    public static Wrapper<?> fillWrapper(IPage<?> page, Wrapper<?> wrapper) {
-        if (null == page) {
-            return wrapper;
-        }
-        if (ArrayUtils.isEmpty(page.ascs())
-            && ArrayUtils.isEmpty(page.descs())
-            && ObjectUtils.isEmpty(page.condition())) {
-            return wrapper;
-        }
-        QueryWrapper qw;
-        if (null == wrapper) {
-            qw = new QueryWrapper<>();
-        } else {
-            qw = (QueryWrapper) wrapper;
-        }
-        // 排序
-        if (ArrayUtils.isNotEmpty(page.ascs())) {
-            qw.orderByAsc(page.ascs());
-        }
-        if (ArrayUtils.isNotEmpty(page.descs())) {
-            qw.orderByDesc(page.descs());
-        }
-        // MAP 参数查询
-        if (ObjectUtils.isNotEmpty(page.condition())) {
-            qw.allEq(page.condition());
-        }
-        return qw;
-    }
 }

mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/activerecord/Model.java

@@ -264,7 +264,7 @@ public abstract class Model<T extends Model> implements Serializable {
      */
     public IPage<T> selectPage(IPage<T> page, Wrapper<T> wrapper) {
         Map<String, Object> map = new HashMap<>(2);
-        map.put(Constants.WRAPPER, SqlHelper.fillWrapper(page, wrapper));
+        map.put(Constants.WRAPPER, wrapper);
         map.put("page", page);
         SqlSession sqlSession = sqlSession();
         try {

mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/service/impl/ServiceImpl.java

@@ -15,34 +15,26 @@
  */
 package com.baomidou.mybatisplus.extension.service.impl;
 
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.stream.Collectors;
-
-import org.apache.ibatis.binding.MapperMethod;
-import org.apache.ibatis.session.SqlSession;
-import org.mybatis.spring.SqlSessionUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.annotation.Transactional;
-
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.enums.SqlMethod;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.metadata.TableInfo;
-import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
-import com.baomidou.mybatisplus.core.toolkit.Constants;
-import com.baomidou.mybatisplus.core.toolkit.ExceptionUtils;
-import com.baomidou.mybatisplus.core.toolkit.GlobalConfigUtils;
-import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
-import com.baomidou.mybatisplus.core.toolkit.ReflectionKit;
-import com.baomidou.mybatisplus.core.toolkit.StringUtils;
-import com.baomidou.mybatisplus.core.toolkit.TableInfoHelper;
+import com.baomidou.mybatisplus.core.toolkit.*;
 import com.baomidou.mybatisplus.core.toolkit.sql.SqlHelper;
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.apache.ibatis.binding.MapperMethod;
+import org.apache.ibatis.session.SqlSession;
+import org.mybatis.spring.SqlSessionUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.io.Serializable;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -317,7 +309,6 @@ public class ServiceImpl<M extends BaseMapper<T>, T> implements IService<T> {
 
     @Override
     public IPage<T> page(IPage<T> page, Wrapper<T> queryWrapper) {
-        queryWrapper = (Wrapper<T>) SqlHelper.fillWrapper(page, queryWrapper);
         return baseMapper.selectPage(page, queryWrapper);
     }
 
@@ -333,7 +324,6 @@ public class ServiceImpl<M extends BaseMapper<T>, T> implements IService<T> {
 
     @Override
     public IPage<Map<String, Object>> pageMaps(IPage<T> page, Wrapper<T> queryWrapper) {
-        queryWrapper = (Wrapper<T>) SqlHelper.fillWrapper(page, queryWrapper);
         return baseMapper.selectMapsPage(page, queryWrapper);
     }
 }

mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/base/entity/CommonData.java

@@ -3,10 +3,13 @@ package com.baomidou.mybatisplus.test.base.entity;
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.Version;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
 import com.baomidou.mybatisplus.test.base.enums.TestEnum;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import java.io.Serializable;
 import java.time.LocalDateTime;
 
 /**
@@ -21,7 +24,8 @@ import java.time.LocalDateTime;
  */
 @Data
 @Accessors(chain = true)
-public class CommonData {
+@EqualsAndHashCode(callSuper = true)
+public class CommonData extends Model<CommonData> {
 
     private Long id;
     @TableField(el = "testInt, jdbcType=INTEGER")
@@ -40,4 +44,12 @@ public class CommonData {
      * 不用配置实体字段,但是数据库需要该字段
      */
 //    private Long tenantId;
+
+    /**
+     * 主键值
+     */
+    @Override
+    protected Serializable pkVal() {
+        return id;
+    }
 }

mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/mysql/MysqlTestDataMapperTest.java

@@ -240,6 +240,18 @@ public class MysqlTestDataMapperTest {
         System.out.println(JSON.toJSONString(mysqlDataPage));
     }
 
+    @Test
+    public void d7_arLambdaSelectPage() {
+        Page<CommonData> page = new Page<>(1, 5);
+        page.setDesc("c_time", "u_time");
+        IPage<CommonData> dataPage = new CommonData().selectPage(page, new QueryWrapper<CommonData>().lambda());
+        Assert.assertSame(dataPage, page);
+        Assert.assertNotEquals(0L, dataPage.getTotal());
+        Assert.assertNotEquals(0, dataPage.getRecords().size());
+        Assert.assertTrue(CollectionUtils.isNotEmpty(dataPage.getRecords()));
+        System.out.println(JSON.toJSONString(dataPage));
+    }
+
     @Test
     public void d8_testApply() {
         Assert.assertTrue(CollectionUtils.isNotEmpty(commonMapper.selectList(new QueryWrapper<CommonData>()