From bed735aae42b6e0c75bf3fd63d9cd0996fba9355 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 21 五月 2025 14:21:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/devlop' into devlop
---
rsf-server/src/main/java/com/vincent/rsf/server/common/domain/PageParam.java | 38 ++++++++++++++++++++++----------------
1 files changed, 22 insertions(+), 16 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/common/domain/PageParam.java b/rsf-server/src/main/java/com/vincent/rsf/server/common/domain/PageParam.java
index 7cb5cfb..01bb3f2 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/common/domain/PageParam.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/common/domain/PageParam.java
@@ -7,6 +7,7 @@
import com.vincent.rsf.common.utils.Utils;
import com.vincent.rsf.framework.common.Cools;
import com.vincent.rsf.framework.common.DateUtils;
+import lombok.Getter;
import java.lang.reflect.Field;
import java.lang.reflect.Modifier;
@@ -21,6 +22,7 @@
private static final long serialVersionUID = 1L;
public static final String ORDER_DESC_VALUE = "desc";
+ @Getter
private final U where;
/**
@@ -71,7 +73,7 @@
}
public QueryWrapper<T> buildWrapper(boolean like, List<String> fields) {
- return this.buildWrapper(like, null,"create_time", fields);
+ return this.buildWrapper(like, null, "create_time", fields);
}
@SuppressWarnings("all")
@@ -80,7 +82,9 @@
Map<String, Object> map = where.getMap();
for (String key : map.keySet()) {
Object val = map.get(key);
-
+ if (Cools.isEmpty(val)){
+ continue;
+ }
if (key.contains("Range")) {
ArrayList<String> list = null;
if (val instanceof ArrayList) {
@@ -133,26 +137,26 @@
if (!Cools.isEmpty(where.getCondition()) && !Cools.isEmpty(cls)) {
List<String> columns = new ArrayList<>();
- for (Field field : Cools.getAllFields(cls)){
+ for (Field field : Cools.getAllFields(cls)) {
if (Modifier.isFinal(field.getModifiers())
|| Modifier.isStatic(field.getModifiers())
- || Modifier.isTransient(field.getModifiers())){
+ || Modifier.isTransient(field.getModifiers())) {
continue;
}
- if (field.isAnnotationPresent(TableField.class)){
+ if (field.isAnnotationPresent(TableField.class)) {
TableField annotation = field.getAnnotation(TableField.class);
if (!annotation.exist()) {
continue;
}
}
- String column = Utils.toSymbolCase(field.getName(), '_');
+ String column = Utils.toSymbolCase(field.getName(), '_');
columns.add(column);
}
if (!columns.isEmpty()) {
queryWrapper.and(wrapper -> {
- for (int i=0;i<columns.size();i++){
+ for (int i = 0; i < columns.size(); i++) {
String column = columns.get(i);
String condition = where.getCondition();
if (i == 0) {
@@ -168,12 +172,14 @@
}
@SuppressWarnings("all")
- public QueryWrapper<T> buildWrapper(boolean like, Consumer<QueryWrapper<T>> consumer,String timeField, List<String> fields) {
+ public QueryWrapper<T> buildWrapper(boolean like, Consumer<QueryWrapper<T>> consumer, String timeField, List<String> fields) {
QueryWrapper<T> queryWrapper = new QueryWrapper<>();
Map<String, Object> map = where.getMap();
for (String key : map.keySet()) {
Object val = map.get(key);
-
+ if (Cools.isEmpty(val)){
+ continue;
+ }
if (key.contains("Range")) {
ArrayList<String> list = null;
if (val instanceof ArrayList) {
@@ -192,9 +198,9 @@
key = Utils.toSymbolCase(key, '_');
}
if (like && !fields.contains(key)) {
- queryWrapper.like("`" + key + "`", val);
+ queryWrapper.like("`" + key + "`", val);
} else {
- queryWrapper.eq("`" + key + "`", val);
+ queryWrapper.eq("`" + key + "`", val);
}
}
}
@@ -223,21 +229,21 @@
if (!Cools.isEmpty(where.getCondition()) && !Cools.isEmpty(cls)) {
List<String> columns = new ArrayList<>();
- for (Field field : Cools.getAllFields(cls)){
+ for (Field field : Cools.getAllFields(cls)) {
if (Modifier.isFinal(field.getModifiers())
|| Modifier.isStatic(field.getModifiers())
- || Modifier.isTransient(field.getModifiers())){
+ || Modifier.isTransient(field.getModifiers())) {
continue;
}
- if (field.isAnnotationPresent(TableField.class)){
+ if (field.isAnnotationPresent(TableField.class)) {
TableField annotation = field.getAnnotation(TableField.class);
if (!annotation.exist()) {
continue;
}
}
- String column = Utils.toSymbolCase(field.getName(), '_');
+ String column = Utils.toSymbolCase(field.getName(), '_');
columns.add(column);
}
// if (!columns.isEmpty()) {
@@ -254,7 +260,7 @@
// }
if (!columns.isEmpty()) {
queryWrapper.and(wrapper -> {
- for (int i=0;i<columns.size();i++){
+ for (int i = 0; i < columns.size(); i++) {
String column = columns.get(i);
String condition = where.getCondition();
if (i == 0) {
--
Gitblit v1.9.1