From 6959b95aeb1579118b7f9be08487f3f75f890a29 Mon Sep 17 00:00:00 2001 From: majintao Date: Tue, 7 Jan 2025 14:58:55 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=B7=E6=9C=AC=E6=B7=BB=E5=8A=A0=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=95=B0=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fangjia/open/controllers/HouseController.java | 12 ++++++++---- .../com/fangjia/open/model/HouseSearchModel.java | 12 ++++++++++++ 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/HouseController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/HouseController.java index fba91b6eb..8870454dc 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/HouseController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/HouseController.java @@ -1000,7 +1000,11 @@ public class HouseController { query.setCityDisplay(model.getCity()); Pager pager = new Pager(); pager.setStartRow(0); - pager.setPageSize(5); + if (model.getPageSize() != null && model.getPageSize() > 0) { + pager.setPageSize(model.getPageSize()); + } else { + pager.setPageSize(5); + } query.setPager(pager); query.setTable("latest_seawater"); houses = seawaterDao.findSeawatersByQuery(query); @@ -1303,14 +1307,14 @@ public class HouseController { pager.setPageSize(model.getPageSize()); query.setPager(pager); query.setTable("latest_seawater"); - if (StringUtils.isNotBlank(model.getSortField())){ + if (StringUtils.isNotBlank(model.getSortField())) { query.setSortField(model.getSortField()); - }else { + } else { query.setSortField("p_date"); } if ("asc".equals(model.getSortBy())) { query.setOrder(true); - }else { + } else { query.setOrder(false); } houses = seawaterDao.findSeawatersByQuery(query); diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/model/HouseSearchModel.java b/projects/fangjia-open/src/main/java/com/fangjia/open/model/HouseSearchModel.java index 8f695b729..39fefbbdc 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/model/HouseSearchModel.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/model/HouseSearchModel.java @@ -27,6 +27,8 @@ public class HouseSearchModel extends SearchModel { private String district; private String cat; + + private Integer pageSize; @Override public QueryBean getQueryBean() { HouseQueryBean queryBean = new HouseQueryBean(); @@ -197,4 +199,14 @@ public class HouseSearchModel extends SearchModel { public void setCat(String cat) { this.cat = cat; } + + @Override + public Integer getPageSize() { + return pageSize; + } + + @Override + public void setPageSize(Integer pageSize) { + this.pageSize = pageSize; + } }