修复框架Sql过滤问题 修复规则编码添加子列表错误问题

skyouc

2025-04-16 d248f83e1a47b2ae25acc46233afbafa353bcfe8

修复框架Sql过滤问题
修复规则编码添加子列表错误问题

 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>

 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>


 rsf-admin/src/page/system/serialRule/SerialRuleItemEdit.jsx

@@ -58,7 +58,6 @@
    return (
        <Edit
            id={record.id}
            redirect="list"
            resource="serialRuleItem"
            mutationMode={EDIT_MODE}
        >

 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;