zhou zhou
14 小时以前 1553782fd262f97a336fecc8b38f8f309fc08ae6
rsf-server/src/main/java/com/vincent/rsf/server/common/domain/BaseParam.java
@@ -79,20 +79,21 @@
            map.remove("condition");
        }
        FieldsService fieldsService = SpringUtils.getBean(FieldsService.class);
        List<Fields> fields = fieldsService.list(new LambdaQueryWrapper<Fields>().eq(Fields::getFlagEnable, 1).eq(Fields::getStatus, 1));
        if (!fields.isEmpty()) {
            for (Fields fields1 : fields) {
                if (null !=map.get(fields1.getFields())){
                    this.fields.put(fields1.getFields(), map.get(fields1.getFields()));
                    map.entrySet().removeIf(next -> next.getKey().equals(fields1.getFields())
                    );
                }
            }
        }
//        FieldsService fieldsService = SpringUtils.getBean(FieldsService.class);
//        List<Fields> fields = fieldsService.list(new LambdaQueryWrapper<Fields>().eq(Fields::getFlagEnable, 1).eq(Fields::getStatus, 1));
//        if (!fields.isEmpty()) {
//            for (Fields fields1 : fields) {
//                if (null !=map.get(fields1.getFields())){
//                    this.fields.put(fields1.getFields(), map.get(fields1.getFields()));
//                    map.entrySet().removeIf(next -> next.getKey().equals(fields1.getFields())
//                    );
//                }
//            }
//
//        }
        this.setMap(map);
    }
}