From 1260736c143bf357705adf12a043f665ae784736 Mon Sep 17 00:00:00 2001 From: Redkale <22250530@qq.com> Date: Mon, 26 Dec 2016 17:31:34 +0800 Subject: [PATCH] --- src/org/redkale/service/DataSourceService.java | 10 ++++++++++ src/org/redkale/source/DataDefaultSource.java | 10 ++++++++++ src/org/redkale/source/DataSource.java | 4 ++++ 3 files changed, 24 insertions(+) diff --git a/src/org/redkale/service/DataSourceService.java b/src/org/redkale/service/DataSourceService.java index 0a46780e1..322f344f5 100644 --- a/src/org/redkale/service/DataSourceService.java +++ b/src/org/redkale/service/DataSourceService.java @@ -213,6 +213,16 @@ public class DataSourceService implements DataSource, Service, AutoCloseable { return source.queryColumnList(selectedColumn, clazz, node); } + @Override + public final List queryColumnList(String selectedColumn, Class clazz, Flipper flipper, FilterBean bean) { + return queryColumnList(selectedColumn, clazz, flipper, FilterNodeBean.createFilterNode(bean)); + } + + @Override + public List queryColumnList(String selectedColumn, Class clazz, Flipper flipper, FilterNode node) { + return source.queryColumnList(selectedColumn, clazz, flipper, node); + } + @Override public final Sheet queryColumnSheet(String selectedColumn, Class clazz, Flipper flipper, FilterBean bean) { return queryColumnSheet(selectedColumn, clazz, flipper, FilterNodeBean.createFilterNode(bean)); diff --git a/src/org/redkale/source/DataDefaultSource.java b/src/org/redkale/source/DataDefaultSource.java index ffc288902..d2facab23 100644 --- a/src/org/redkale/source/DataDefaultSource.java +++ b/src/org/redkale/source/DataDefaultSource.java @@ -1413,6 +1413,16 @@ public final class DataDefaultSource implements DataSource, Function) queryColumnSheet(false, selectedColumn, clazz, null, node).list(true); } + @Override + public List queryColumnList(final String selectedColumn, final Class clazz, final Flipper flipper, final FilterBean bean) { + return queryColumnList(selectedColumn, clazz, FilterNodeBean.createFilterNode(bean)); + } + + @Override + public List queryColumnList(final String selectedColumn, final Class clazz, final Flipper flipper, final FilterNode node) { + return (List) queryColumnSheet(false, selectedColumn, clazz, flipper, node).list(true); + } + /** * 根据指定参数查询对象某个字段的集合 *

diff --git a/src/org/redkale/source/DataSource.java b/src/org/redkale/source/DataSource.java index 948fba6e6..009c368ef 100644 --- a/src/org/redkale/source/DataSource.java +++ b/src/org/redkale/source/DataSource.java @@ -157,6 +157,10 @@ public interface DataSource { public List queryColumnList(final String selectedColumn, final Class clazz, final FilterNode node); + public List queryColumnList(final String selectedColumn, final Class clazz, final Flipper flipper, final FilterBean bean); + + public List queryColumnList(final String selectedColumn, final Class clazz, final Flipper flipper, final FilterNode node); + /** * 根据指定参数查询对象某个字段的集合 *