From ecbbffb9d73f0300eb971f1a3f2f0c766a26e80b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=9C=B0=E5=B9=B3=E7=BA=BF?= <22250530@qq.com>
Date: Wed, 15 Jul 2015 22:21:12 +0800
Subject: [PATCH]

---
 src/com/wentch/redkale/source/DataJDBCSource.java | 14 +++++++-------
 src/com/wentch/redkale/source/DataSource.java     |  9 +++++----
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/com/wentch/redkale/source/DataJDBCSource.java b/src/com/wentch/redkale/source/DataJDBCSource.java
index bb9cbd635..e5dc90ac9 100644
--- a/src/com/wentch/redkale/source/DataJDBCSource.java
+++ b/src/com/wentch/redkale/source/DataJDBCSource.java
@@ -1055,29 +1055,29 @@ public final class DataJDBCSource implements DataSource {
      * @return
      */
     @Override
-    public <T> Map<Serializable, T> queryMap(final Class<T> clazz, final FilterBean bean) {
+    public <K extends Serializable, T> Map<K, T> queryMap(final Class<T> clazz, final FilterBean bean) {
         return queryMap(clazz, null, bean);
     }
 
     @Override
-    public <T> Map<Serializable, T> queryMap(final Class<T> clazz, final FilterNode node) {
+    public <K extends Serializable, T> Map<K, T> queryMap(final Class<T> clazz, final FilterNode node) {
         return queryMap(clazz, null, node);
     }
 
     @Override
-    public <T> Map<Serializable, T> queryMap(final Class<T> clazz, final SelectColumn selects, final FilterBean bean) {
+    public <K extends Serializable, T> Map<K, T> queryMap(final Class<T> clazz, final SelectColumn selects, final FilterBean bean) {
         return formatMap(clazz, querySheet(clazz, selects, null, bean).getRows());
     }
 
     @Override
-    public <T> Map<Serializable, T> queryMap(final Class<T> clazz, final SelectColumn selects, final FilterNode node) {
+    public <K extends Serializable, T> Map<K, T> queryMap(final Class<T> clazz, final SelectColumn selects, final FilterNode node) {
         return formatMap(clazz, querySheet(clazz, selects, null, node).getRows());
     }
 
-    private <T> Map<Serializable, T> formatMap(final Class<T> clazz, Collection<T> list) {
-        Map<Serializable, T> map = new LinkedHashMap<>();
+    private <K extends Serializable, T> Map<K, T> formatMap(final Class<T> clazz, Collection<T> list) {
+        Map<K, T> map = new LinkedHashMap<>();
         if (list == null || list.isEmpty()) return map;
-        final Attribute<T, Serializable> attr = loadEntityInfo(clazz).getPrimary();
+        final Attribute<T, K> attr = (Attribute<T, K>) loadEntityInfo(clazz).getPrimary();
         for (T t : list) {
             map.put(attr.get(t), t);
         }
diff --git a/src/com/wentch/redkale/source/DataSource.java b/src/com/wentch/redkale/source/DataSource.java
index 189571012..852110ace 100644
--- a/src/com/wentch/redkale/source/DataSource.java
+++ b/src/com/wentch/redkale/source/DataSource.java
@@ -166,18 +166,19 @@ public interface DataSource {
     /**
      * Map 接口
      * <p>
+     * @param <K>
      * @param <T>
      * @param clazz
      * @param node
      * @return
      */
-    public <T> Map<Serializable, T> queryMap(final Class<T> clazz, final FilterNode node);
+    public <K extends Serializable, T> Map<K, T> queryMap(final Class<T> clazz, final FilterNode node);
 
-    public <T> Map<Serializable, T> queryMap(final Class<T> clazz, final FilterBean bean);
+    public <K extends Serializable, T> Map<K, T> queryMap(final Class<T> clazz, final FilterBean bean);
 
-    public <T> Map<Serializable, T> queryMap(final Class<T> clazz, final SelectColumn selects, final FilterNode node);
+    public <K extends Serializable, T> Map<K, T> queryMap(final Class<T> clazz, final SelectColumn selects, final FilterNode node);
 
-    public <T> Map<Serializable, T> queryMap(final Class<T> clazz, final SelectColumn selects, final FilterBean bean);
+    public <K extends Serializable, T> Map<K, T> queryMap(final Class<T> clazz, final SelectColumn selects, final FilterBean bean);
 
     /**
      * 根据指定字段值查询对象集合