miemie 5 years ago
parent
commit
20ddb25d3d

+ 3 - 3
mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/assist/ISqlRunner.java

@@ -15,11 +15,11 @@
  */
 package com.baomidou.mybatisplus.core.assist;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
 import java.util.List;
 import java.util.Map;
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
-
 /**
  * <p>
  * </p>
@@ -55,5 +55,5 @@ public interface ISqlRunner {
 
     Map<String, Object> selectOne(String sql, Object... args);
 
-    IPage<Map<String, Object>> selectPage(IPage<?> page, String sql, Object... args);
+    <E extends IPage<Map<String, Object>>> E selectPage(E page, String sql, Object... args);
 }

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

@@ -206,7 +206,7 @@ public abstract class Model<T extends Model<?>> implements Serializable {
      * @param page         翻页查询条件
      * @param queryWrapper 实体对象封装操作类(可以为 null)
      */
-    public IPage<T> selectPage(IPage<T> page, Wrapper<T> queryWrapper) {
+    public <E extends IPage<T>> E selectPage(E page, Wrapper<T> queryWrapper) {
         Map<String, Object> map = new HashMap<>(2);
         map.put(Constants.WRAPPER, queryWrapper);
         map.put("page", page);

+ 1 - 2
mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/toolkit/SqlRunner.java

@@ -203,9 +203,8 @@ public class SqlRunner implements ISqlRunner {
         return SqlHelper.getObject(log, selectList(sql, args));
     }
 
-    @SuppressWarnings({"unchecked", "rawtypes"})
     @Override
-    public IPage<Map<String, Object>> selectPage(IPage page, String sql, Object... args) {
+    public <E extends IPage<Map<String, Object>>> E selectPage(E page, String sql, Object... args) {
         if (null == page) {
             return null;
         }