no message

skyouc

2025-04-21 9bec566884971e1241aaaa61aac5eed8bcfa0dd3

 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;
@@ -236,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;