🐛 Fixing a bug. | closed #2398 分页方法IPage泛型

pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysUserMapper.java

@@ -29,8 +29,6 @@ import com.pig4cloud.pigx.common.data.datascope.PigxBaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
-import java.util.List;
-
 /**
  * <p>
  * 用户表 Mapper 接口
@@ -56,7 +54,7 @@ public interface SysUserMapper extends PigxBaseMapper<SysUser> {
 	 * @param dataScope
 	 * @return list
 	 */
-	IPage<List<UserVO>> getUserVosPage(Page page, @Param("query") UserDTO userDTO, DataScope dataScope);
+	IPage<UserVO> getUserVosPage(Page page, @Param("query") UserDTO userDTO, DataScope dataScope);
 
 	/**
 	 * 通过ID查询用户信息

pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/mapper/GeneratorMapper.java

@@ -17,6 +17,9 @@
 
 package com.pig4cloud.pigx.codegen.mapper;
 
+import java.util.List;
+import java.util.Map;
+
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -24,9 +27,6 @@ import com.pig4cloud.pigx.codegen.entity.ColumnEntity;
 import com.pig4cloud.pigx.common.data.datascope.PigxBaseMapper;
 import org.apache.ibatis.annotations.Param;
 
-import java.util.List;
-import java.util.Map;
-
 /**
  * 代码生成器
  *
@@ -41,7 +41,7 @@ public interface GeneratorMapper extends PigxBaseMapper<ColumnEntity> {
 	 * @param tableName 表名称
 	 * @return
 	 */
-	IPage<List<Map<String, Object>>> queryTable(Page page, @Param("tableName") String tableName);
+	IPage<Map<String, Object>> queryTable(Page page, @Param("tableName") String tableName);
 
 	/**
 	 * 查询表信息

pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/service/GeneratorService.java

@@ -17,13 +17,12 @@
 
 package com.pig4cloud.pigx.codegen.service;
 
+import java.util.Map;
+
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.pig4cloud.pigx.codegen.entity.GenConfig;
 
-import java.util.List;
-import java.util.Map;
-
 /**
  * @author lengleng
  * @date 2018/7/29
@@ -44,7 +43,7 @@ public interface GeneratorService {
 	 * @param name 数据源ID
 	 * @return
 	 */
-	IPage<List<Map<String, Object>>> getPage(Page page, String tableName, String name);
+	IPage<Map<String, Object>> getPage(Page page, String tableName, String name);
 
 	/**
 	 * 预览代码

pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/service/impl/GeneratorServiceImpl.java

@@ -17,6 +17,11 @@
 
 package com.pig4cloud.pigx.codegen.service.impl;
 
+import java.io.ByteArrayOutputStream;
+import java.util.List;
+import java.util.Map;
+import java.util.zip.ZipOutputStream;
+
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.io.IoUtil;
 import cn.hutool.core.map.MapUtil;
@@ -34,11 +39,6 @@ import com.pig4cloud.pigx.codegen.util.GenUtils;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 
-import java.io.ByteArrayOutputStream;
-import java.util.List;
-import java.util.Map;
-import java.util.zip.ZipOutputStream;
-
 /**
  * @author lengleng
  * @date 2018-07-30
@@ -58,7 +58,7 @@ public class GeneratorServiceImpl implements GeneratorService {
 	 * @return
 	 */
 	@Override
-	public IPage<List<Map<String, Object>>> getPage(Page page, String tableName, String dsName) {
+	public IPage<Map<String, Object>> getPage(Page page, String tableName, String dsName) {
 		GeneratorMapper mapper = GenUtils.getMapper(dsName);
 		// 手动切换数据源
 		DynamicDataSourceContextHolder.push(dsName);