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 | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/common/web/BaseController.java b/src/main/java/com/zy/common/web/BaseController.java
index af55b2b..c206865 100644
--- a/src/main/java/com/zy/common/web/BaseController.java
+++ b/src/main/java/com/zy/common/web/BaseController.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.annotations.TableField;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.plugins.Page;
import com.core.common.BaseRes;
import com.core.common.Cools;
import com.core.controller.AbstractBaseController;
@@ -14,9 +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.Set;
+import java.util.*;
/**
* Created by vincent on 2019-09-09
@@ -48,6 +47,16 @@
}
}
return "";
+ }
+
+ 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;
}
/**
@@ -83,7 +92,7 @@
}
for (int i=0;i<columns.size();i++){
if (i==0){
- wrapper.and();
+ wrapper.andNew();
} else {
wrapper.or();
}
--
Gitblit v1.9.1