git-svn-id: https://192.168.57.71/svn/jsgkj@1321 931142cf-59ea-a443-aa0e-51397b428577

gkaqv2/trunk/modules/web/src/main/java/com/xt/js/gkaq/web/ctl/DictCtl.java

@@ -70,13 +70,7 @@ public class DictCtl extends BaseCtl {
     @SysLog(description="字典列表查询")
     public PageInfo<CodeModelDto> getPageInfo(DictVo vo) throws UnsupportedEncodingException {
         // 初始化参数
-        if (null == vo.getPage() || vo.getPage() < 1) {
-            vo.setPage(1);
-        }
-        if (null == vo.getRows() || vo.getRows() < 1) {
-            vo.setRows(1);
-        }
-        PageHelper.startPage(vo.getPage(), vo.getRows());
+        PageHelper.startPage(vo.getcPage(), vo.getpSize());
 
         CodeModelDto model = new CodeModelDto();
         if (StringUtils.isNotEmpty(vo.getText())) {

gkaqv2/trunk/modules/web/src/main/java/com/xt/js/gkaq/web/ctl/MenuCtl.java

@@ -73,13 +73,7 @@ public class MenuCtl extends BaseCtl {
     @SysLog(description="菜单列表查询")
     public PageInfo<MenuModel> getPageInfo(MenuVo vo) throws UnsupportedEncodingException {
         // 初始化参数
-        if (null == vo.getPage() || vo.getPage() < 1) {
-            vo.setPage(1);
-        }
-        if (null == vo.getRows() || vo.getRows() < 1) {
-            vo.setRows(1);
-        }
-        PageHelper.startPage(vo.getPage(), vo.getRows());
+        PageHelper.startPage(vo.getcPage(), vo.getpSize());
         MenuModel model = new MenuModel();
         if (StringUtils.isNotEmpty(vo.getName())) {
             model.setName("%" + URLDecoder.decode(vo.getName(), "UTF-8") + "%");

gkaqv2/trunk/modules/web/src/main/java/com/xt/js/gkaq/web/ctl/OrgCtl.java

@@ -81,13 +81,7 @@ public class OrgCtl extends BaseCtl {
     @SysLog(description="组织列表查询")
     public PageInfo<OrgModelDto> getPageInfo(OrgVo vo) throws UnsupportedEncodingException {
         // 初始化参数
-        if (null == vo.getPage() || vo.getPage() < 1) {
-            vo.setPage(1);
-        }
-        if (null == vo.getRows() || vo.getRows() < 1) {
-            vo.setRows(1);
-        }
-        PageHelper.startPage(vo.getPage(), vo.getRows());
+        PageHelper.startPage(vo.getcPage(), vo.getpSize());
 
         OrgModelDto model = new OrgModelDto();
         if (StringUtils.isNotEmpty(vo.getName())) {

gkaqv2/trunk/modules/web/src/main/java/com/xt/js/gkaq/web/ctl/ParamCtl.java

@@ -53,13 +53,7 @@ public class ParamCtl extends BaseCtl {
     @SysLog(description="参数列表查询")
     public PageInfo<ParamModel> getPageInfo(ParamVo vo) {
         // 初始化参数
-        if (null == vo.getPage() || vo.getPage() < 1) {
-            vo.setPage(1);
-        }
-        if (null == vo.getRows() || vo.getRows() < 1) {
-            vo.setRows(1);
-        }
-        PageHelper.startPage(vo.getPage(), vo.getRows());
+        PageHelper.startPage(vo.getcPage(), vo.getpSize());
 
         ParamModel model = new ParamModel();
         BeanUtils.copyProperties(vo, model);

gkaqv2/trunk/modules/web/src/main/java/com/xt/js/gkaq/web/ctl/RoleCtl.java

@@ -64,13 +64,7 @@ public class RoleCtl extends BaseCtl {
     @SysLog(description="角色列表查询")
     public PageInfo<RoleModel> getPageInfo(RoleVo vo) throws UnsupportedEncodingException {
         // 初始化参数
-        if (null == vo.getPage() || vo.getPage() < 1) {
-            vo.setPage(1);
-        }
-        if (null == vo.getRows() || vo.getRows() < 1) {
-            vo.setRows(1);
-        }
-        PageHelper.startPage(vo.getPage(), vo.getRows());
+        PageHelper.startPage(vo.getcPage(), vo.getpSize());
 
         RoleModel model = new RoleModel();
         if (StringUtils.isNotEmpty(vo.getName())) {

gkaqv2/trunk/modules/web/src/main/java/com/xt/js/gkaq/web/ctl/UserCtl.java

@@ -57,13 +57,7 @@ public class UserCtl extends BaseCtl {
     @SysLog(description="用户列表查询")
 	public PageInfo<UserModel> getPageInfo(UserVo vo) throws UnsupportedEncodingException {
 		// 初始化参数
-		if (null == vo.getPage() || vo.getPage() < 1) {
-			vo.setPage(1);
-		}
-		if (null == vo.getRows() || vo.getRows() < 1) {
-			vo.setRows(1);
-		}
-		PageHelper.startPage(vo.getPage(), vo.getRows());
+        PageHelper.startPage(vo.getcPage(), vo.getpSize());
 		UserModel model = new UserModel();
         if (StringUtils.isNotEmpty(vo.getRealName())) {
             model.setRealName("%" + URLDecoder.decode(vo.getRealName(), "UTF-8") + "%");

gkaqv2/trunk/modules/web/src/main/java/com/xt/js/gkaq/web/ctl/XzqhCtl.java

@@ -57,13 +57,7 @@ public class XzqhCtl extends BaseCtl {
     @SysLog(description="行政区划列表查询")
     public PageInfo<XzqhModel> getPageInfo(XzqhVo vo) throws UnsupportedEncodingException {
         // 初始化参数
-        if (null == vo.getPage() || vo.getPage() < 1) {
-            vo.setPage(1);
-        }
-        if (null == vo.getRows() || vo.getRows() < 1) {
-            vo.setRows(1);
-        }
-        PageHelper.startPage(vo.getPage(), vo.getRows());
+        PageHelper.startPage(vo.getcPage(), vo.getpSize());
 
         XzqhModel model = new XzqhModel();
         if (StringUtils.isNotEmpty(vo.getCode())) {