From b4aa377b5e7898cd2ef018cc385a19af67a56839 Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Mon, 26 Mar 2018 14:05:58 +0800
Subject: [PATCH] Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2.git

---
 src/main/java/com/moral/common/util/MyBatisBaseMapUtil.java |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/moral/common/util/MyBatisBaseMapUtil.java b/src/main/java/com/moral/common/util/MyBatisBaseMapUtil.java
index 6e38228..5b04510 100644
--- a/src/main/java/com/moral/common/util/MyBatisBaseMapUtil.java
+++ b/src/main/java/com/moral/common/util/MyBatisBaseMapUtil.java
@@ -28,8 +28,10 @@
           return  page;
      }
      public static PageBean queryPage(BaseMapper baseMapper,PageBean pageBean, Example example){
-          PageHelper.startPage(pageBean.getPageIndex(),pageBean.getPageSize());
+          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