From 2d4d397ce9ea8e53d4a63b6463c02a7586fb27ea Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Thu, 08 Aug 2019 17:03:55 +0800
Subject: [PATCH] Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2
---
src/main/java/com/moral/common/util/MyBatisBaseMapUtil.java | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/moral/common/util/MyBatisBaseMapUtil.java b/src/main/java/com/moral/common/util/MyBatisBaseMapUtil.java
index c306d46..e064724 100644
--- a/src/main/java/com/moral/common/util/MyBatisBaseMapUtil.java
+++ b/src/main/java/com/moral/common/util/MyBatisBaseMapUtil.java
@@ -3,29 +3,29 @@
import com.github.pagehelper.PageHelper;
import com.moral.common.bean.PageBean;
import com.moral.common.mapper.BaseMapper;
-import com.moral.entity.Account;
import lombok.extern.log4j.Log4j;
import tk.mybatis.mapper.entity.Example;
-import tk.mybatis.mapper.mapperhelper.MapperHelper;
-import tk.mybatis.mapper.mapperhelper.MapperTemplate;
-
-import java.io.UnsupportedEncodingException;
-import java.lang.reflect.Type;
import java.util.List;
@Log4j
public class MyBatisBaseMapUtil {
- public static PageBean queryPage(BaseMapper baseMapper, PageBean pageBean,Class clazz){
- List page = null;
+ public static PageBean queryPage(BaseMapper baseMapper,PageBean pageBean,Class clazz){
+ PageBean page = null;
try {
- Example example = ExampleUtil.generateExample(clazz,pageBean.getQueryParams());
- PageHelper.startPage(pageBean.getPageIndex(),pageBean.getPageSize());
- page = baseMapper.selectByExample(example);
+ Example example = ExampleUtil.generateExample(clazz,pageBean);
+ page = queryPage(baseMapper,pageBean,example);
}catch (Exception ex){
log.error(ex.getMessage());
ex.printStackTrace();
}
+ return page;
+ }
+ public static PageBean queryPage(BaseMapper baseMapper,PageBean pageBean, Example example){
+ if(pageBean.getPageSize()>0){
+ PageHelper.startPage(pageBean.getPageIndex(),pageBean.getPageSize());
+ }
+ List page = baseMapper.selectByExample(example);
return new PageBean(page);
}
-}
+}
\ No newline at end of file
--
Gitblit v1.8.0