Browse Source

修复AR分页无效.

nieqiurong 7 years ago
parent
commit
30b1b3b53d

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

@@ -236,8 +236,9 @@ public abstract class Model<T extends Model> implements Serializable {
      * @return
      */
     public IPage<T> selectPage(IPage<T> page, Wrapper<T> wrapper) {
-        Map<String, Object> map = new HashMap<>(1);
+        Map<String, Object> map = new HashMap<>(2);
         map.put("ew", SqlHelper.fillWrapper(page, wrapper));
+        map.put("page",page);
         try(SqlSession session = sqlSession()) {
             page.setRecords(session.selectList(sqlStatement(SqlMethod.SELECT_PAGE), map));
         }

+ 39 - 5
mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/h2/ActiveRecordTest.java

@@ -1,7 +1,9 @@
 package com.baomidou.mybatisplus.test.h2;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.test.h2.config.H2Db;
-import com.baomidou.mybatisplus.test.h2.entity.mapper.H2StudentMapper;
 import com.baomidou.mybatisplus.test.h2.entity.persistent.H2Student;
 import org.junit.Assert;
 import org.junit.BeforeClass;
@@ -9,11 +11,11 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import java.io.IOException;
 import java.sql.SQLException;
+import java.util.List;
 
 
 /**
@@ -26,9 +28,6 @@ public class ActiveRecordTest {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(ActiveRecordTest.class);
 
-    @Autowired
-    private H2StudentMapper studentMapper;
-
     @BeforeClass
     public static void InitDB() throws SQLException, IOException {
         H2Db.initH2Student();
@@ -40,4 +39,39 @@ public class ActiveRecordTest {
         Assert.assertTrue(student.insert());
     }
 
+    @Test
+    public void testUpdate(){
+        H2Student student = new H2Student(1L,"Tom长大了",2);
+        Assert.assertTrue(student.updateById());
+    }
+
+    @Test
+    public void testSelect(){
+        H2Student student = new H2Student();
+        student.setId(1L);
+        LOGGER.info("student:{}",student.selectById());
+    }
+
+    @Test
+    public void testDelete(){
+        H2Student student = new H2Student();
+        student.setId(2L);
+        Assert.assertTrue(student.deleteById());
+    }
+
+    @Test
+    public void testSelectList(){
+        H2Student h2Student = new H2Student();
+        h2Student.selectList(new QueryWrapper<>(h2Student)).forEach(student -> LOGGER.info("用户信息:{}",student));
+    }
+
+    @Test
+    public void testSelectPage(){
+        IPage<H2Student> page = new Page<>(1,10);
+        H2Student h2Student = new H2Student();
+        page = h2Student.selectPage(page, new QueryWrapper<>(h2Student));
+        List<H2Student> records = page.getRecords();
+        LOGGER.info("总数:{}",page.getTotal());
+        records.forEach(student -> LOGGER.info("用户信息:{}",student));
+    }
 }