From 85e73ca865bb631f123a7aec80c1cd5818c18c9f Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 22 六月 2020 13:45:32 +0800
Subject: [PATCH] 全文搜索
---
src/main/java/com/zy/common/web/BaseController.java | 15 +++++++--------
1 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/zy/common/web/BaseController.java b/src/main/java/com/zy/common/web/BaseController.java
index a3f319e..c206865 100644
--- a/src/main/java/com/zy/common/web/BaseController.java
+++ b/src/main/java/com/zy/common/web/BaseController.java
@@ -15,10 +15,7 @@
import javax.servlet.http.HttpServletRequest;
import java.lang.reflect.Field;
import java.lang.reflect.Modifier;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
/**
* Created by vincent on 2019-09-09
@@ -52,10 +49,12 @@
return "";
}
- protected <T> Page<T> toPage(Integer curr, Integer limit, Map<String, Object> param){
- Page<T> page = new Page<T>(curr, limit);
- param.put("pageNumber", Integer.parseInt(String.valueOf(param.get("curr"))));
- param.put("pageSize", Integer.parseInt(String.valueOf(param.get("limit"))));
+ protected <T> Page<T> toPage(Integer pageNumber, Integer pageSize, Map<String, Object> param){
+ pageNumber = Optional.ofNullable(pageNumber).orElse(1);
+ pageSize = Optional.ofNullable(pageSize).orElse(10);
+ Page<T> page = new Page<>(pageNumber, pageSize);
+ param.put("pageNumber", pageNumber);
+ param.put("pageSize", pageSize);
page.setCondition(param);
return page;
}
--
Gitblit v1.9.1