From a31816bd82fcf2c10df0cef7f078645676149e78 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Wed, 27 Jun 2018 13:56:32 +0800
Subject: [PATCH] 大屏布局监控点 返回配置数据 完善

---
 src/main/java/com/moral/common/util/MyBatisBaseMapUtil.java |   18 ++++++++++++------
 1 files changed, 12 insertions(+), 6 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..5b04510 100644
--- a/src/main/java/com/moral/common/util/MyBatisBaseMapUtil.java
+++ b/src/main/java/com/moral/common/util/MyBatisBaseMapUtil.java
@@ -15,17 +15,23 @@
 
 @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