From 8f5cdc2bae1ca3ebbe79db52b54591e8a0fb9321 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 17 四月 2025 16:25:05 +0800
Subject: [PATCH] 问题修复

---
 rsf-server/src/main/java/com/vincent/rsf/server/common/domain/PageParam.java |   31 ++++++++++++++++++++++---------
 1 files changed, 22 insertions(+), 9 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 69e88b9..7cb5cfb 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
@@ -240,17 +240,30 @@
                 String column =  Utils.toSymbolCase(field.getName(), '_');
                 columns.add(column);
             }
+//            if (!columns.isEmpty()) {
+//                for (int i=0;i<columns.size();i++){
+//                    String column = columns.get(i);
+//                    String condition = where.getCondition();
+//
+//                    if (i == 0) {
+//                        queryWrapper.and(wrapper -> wrapper.like("`" + column + "`", condition));
+//                    } else {
+//                        queryWrapper.or().like("`" + column + "`", condition);
+//                    }
+//                }
+//            }
             if (!columns.isEmpty()) {
-                for (int i=0;i<columns.size();i++){
-                    String column = columns.get(i);
-                    String condition = where.getCondition();
-
-                    if (i == 0) {
-                        queryWrapper.and(wrapper -> wrapper.like("`" + column + "`", condition));
-                    } else {
-                        queryWrapper.or().like("`" + column + "`", condition);
+                queryWrapper.and(wrapper -> {
+                    for (int i=0;i<columns.size();i++){
+                        String column = columns.get(i);
+                        String condition = where.getCondition();
+                        if (i == 0) {
+                            wrapper.or().like("`" + column + "`", condition);
+                        } else {
+                            wrapper.or().like("`" + column + "`", condition);
+                        }
                     }
-                }
+                });
             }
         }
         return queryWrapper;

--
Gitblit v1.9.1