From d248f83e1a47b2ae25acc46233afbafa353bcfe8 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 16 四月 2025 19:00:16 +0800
Subject: [PATCH] 修复框架Sql过滤问题 修复规则编码添加子列表错误问题
---
rsf-admin/src/page/system/serialRule/SerialRuleItemEdit.jsx | 1 -
rsf-admin/src/page/system/serialRule/SerialRuleCreate.jsx | 2 +-
rsf-server/src/main/java/com/vincent/rsf/server/common/domain/PageParam.java | 26 +++++++++++++++-----------
rsf-admin/src/page/system/serialRule/SerialRuleItemCreate.jsx | 3 +--
4 files changed, 17 insertions(+), 15 deletions(-)
diff --git a/rsf-admin/src/page/system/serialRule/SerialRuleCreate.jsx b/rsf-admin/src/page/system/serialRule/SerialRuleCreate.jsx
index 7ea0c01..e1c9409 100644
--- a/rsf-admin/src/page/system/serialRule/SerialRuleCreate.jsx
+++ b/rsf-admin/src/page/system/serialRule/SerialRuleCreate.jsx
@@ -172,7 +172,7 @@
zIndex: 1000,
}}
>
- <Toolbar sx={{ width: "100%", justifyContent: "space-between" }}>
+ <Toolbar sx={{ width: "100%", justifyContent: "end" }}>
<SaveButton />
</Toolbar>
</DialogActions>
diff --git a/rsf-admin/src/page/system/serialRule/SerialRuleItemCreate.jsx b/rsf-admin/src/page/system/serialRule/SerialRuleItemCreate.jsx
index e589cce..554fbe1 100644
--- a/rsf-admin/src/page/system/serialRule/SerialRuleItemCreate.jsx
+++ b/rsf-admin/src/page/system/serialRule/SerialRuleItemCreate.jsx
@@ -55,6 +55,7 @@
return (
<>
<CreateBase
+ resource="serialRuleItem"
record={{}}
transform={(data) => {
return data;
@@ -119,14 +120,12 @@
<NumberInput
label="table.field.serialRuleItem.lenStr"
source="lenStr"
- validate={required()}
/>
</Grid>
<Grid item xs={6} display="flex" gap={1}>
<NumberInput
label="table.field.serialRuleItem.sort"
source="sort"
- validate={required()}
/>
</Grid>
diff --git a/rsf-admin/src/page/system/serialRule/SerialRuleItemEdit.jsx b/rsf-admin/src/page/system/serialRule/SerialRuleItemEdit.jsx
index 22117c7..4dc8087 100644
--- a/rsf-admin/src/page/system/serialRule/SerialRuleItemEdit.jsx
+++ b/rsf-admin/src/page/system/serialRule/SerialRuleItemEdit.jsx
@@ -58,7 +58,6 @@
return (
<Edit
id={record.id}
- redirect="list"
resource="serialRuleItem"
mutationMode={EDIT_MODE}
>
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 ea2e93f..69e88b9 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
@@ -98,10 +98,13 @@
if (this.isToUnderlineCase) {
key = Utils.toSymbolCase(key, '_');
}
+ String finalKey = key;
if (like && key.contains(timeField)) {
- queryWrapper.like("`" + key + "`", val);
+ queryWrapper.and(wrapper -> wrapper.like("`" + finalKey + "`", val));
+// queryWrapper.like("`" + key + "`", val);
} else {
- queryWrapper.eq("`" + key + "`", val);
+ queryWrapper.and(wrapper -> wrapper.eq("`" + finalKey + "`", val));
+// queryWrapper.eq("`" + key + "`", val);
}
}
}
@@ -148,16 +151,17 @@
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);
+ 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