Index: src/main/java/com/napa/pulse/dao/impl/HubSpokeNetworkDAOImpl.java
===================================================================
diff -u -r00e66cf295d896796bc64e5091f1b8490ed49504 -rb7fcefc10118ea0f2ea718bb6b3edfcd8f7a0d2f
--- src/main/java/com/napa/pulse/dao/impl/HubSpokeNetworkDAOImpl.java	(.../HubSpokeNetworkDAOImpl.java)	(revision 00e66cf295d896796bc64e5091f1b8490ed49504)
+++ src/main/java/com/napa/pulse/dao/impl/HubSpokeNetworkDAOImpl.java	(.../HubSpokeNetworkDAOImpl.java)	(revision b7fcefc10118ea0f2ea718bb6b3edfcd8f7a0d2f)
@@ -1448,12 +1448,8 @@
             String sql = "SELECT SPOKE_SITE_ID FROM HS_NETWORK_SPOKE WHERE NETWORK_HUB_ID = " + hubsIds + " ";
                 SqlRowSet rs = jdbcTemplate.queryForRowSet ( sql );
                 while (rs.next ( )) {
-
-                    HubSiteProducts obj = new HubSiteProducts ( );
-                    obj.setSpokeSiteId ( rs.getInt ( "SPOKE_SITE_ID" ) );
                     list.add ( rs.getInt ( 1 ) );
                     map.put ( hubsIds ,list );
-
                 }
             mapList.add ( map );
         }
Index: src/main/java/com/napa/pulse/dao/impl/SiteGroupDAOImpl.java
===================================================================
diff -u -r2d5c4f7109afa0ee87ee6e6f0f104be5bc708b07 -rb7fcefc10118ea0f2ea718bb6b3edfcd8f7a0d2f
--- src/main/java/com/napa/pulse/dao/impl/SiteGroupDAOImpl.java	(.../SiteGroupDAOImpl.java)	(revision 2d5c4f7109afa0ee87ee6e6f0f104be5bc708b07)
+++ src/main/java/com/napa/pulse/dao/impl/SiteGroupDAOImpl.java	(.../SiteGroupDAOImpl.java)	(revision b7fcefc10118ea0f2ea718bb6b3edfcd8f7a0d2f)
@@ -277,16 +277,16 @@
                     + "s.LATITUDE as \"latitude\", s.LONGITUDE as \"longitude\", to_char(SNAPSHOT_DT, 'MM/DD/YYYY') as \"snapshotDt\", to_char(STAGED_SNAPSHOT_DT, 'MM/DD/YYYY') as \"stagedSnapshotDt\", "
                     + "to_char(EPTS_UPDATE_DT, 'MM/DD/YYYY') as \"eptsUpdateDt\", to_char(SALES_UPDATE_DT, 'MM/DD/YYYY') as \"salesUpdateDt\", "
                     + "ict.ma_inv_coll_template_id as \"invCollTemplateId\", ma_inv_coll_template_name as \"invCollTemplateName\", store_type_code as \"storeTypeCode\", "
-                    + "sum(case when sm.site_id is not null then 1 else 0 end) as \"marketCount\", hsn.hs_network_name  as \"networkName\", hsn.hs_network_id  as \"networkId\",hsn.hs_network_type_id  as \"networkTypeId\", hsnh.network_hub_id  as \"networkHubId\" ,"
-                    +" hsn.is_active AS \"isActive\"  "
+                    + "sum(case when sm.site_id is not null then 1 else 0 end) as \"marketCount\", hsn.hs_network_name  as \"networkName\", hsn.hs_network_id  as \"networkId\",hsn.hs_network_type_id  as \"networkTypeId\", hsnh.network_hub_id  as \"networkHubId\" , "
+                    +" hsn.is_active AS \"isActive\",hspm.hsn_product_map_id as \"product_map_id\", hspm.hsn_product_map_name as  \"product_map_name\" "
                     + "from site s "
                     + "inner join site_type st on s.SITE_TYPE_CODE = st.SITE_TYPE_CODE "
                     + "left join site_market sm on s.site_id = sm.site_id "
                     + "left join major_account ma on s.major_account_id = ma.major_account_id "
                     + "left join ma_inv_coll_template ict on ict.ma_inv_coll_template_id = nvl(s.ma_inv_coll_template_id, ma.default_inv_coll_template_id) "
                     + " left join hs_network_hub hsnh on hsnh.hub_site_id = s.site_id and hsnh.is_active = 1"
                     + " left join hub_spoke_network hsn on hsn.hs_network_id = hsnh.network_id and hsn.is_active = 1"
-//                    + " left join hs_network_spoke hsns on hsns.spoke_site_id = s.site_id"
+                    + " left join hs_network_product_map  hspm on hspm.network_hub_id = hsnh.network_hub_id and hspm.is_active = 1 "
                     + " WHERE s.ACTIVE_FLAG = 'Y' "+jasStoreOnly;
 
             if (userId == 0) {
@@ -306,7 +306,7 @@
                     "hsn.is_active,"+
                     "hsn.hs_network_name,"+
                     "hsn.hs_network_type_id,"+
-                    "hsnh.network_hub_id,  hsn.hs_network_type_id, store_type_code ";
+                    "hsnh.network_hub_id,  hsn.hs_network_type_id, hspm.hsn_product_map_id, hspm.hsn_product_map_name, store_type_code ";
 
             sql += " order by s.SITE_NAME";
 
@@ -328,15 +328,15 @@
                         + "to_char(EPTS_UPDATE_DT, 'MM/DD/YYYY') as \"eptsUpdateDt\", to_char(SALES_UPDATE_DT, 'MM/DD/YYYY') as \"salesUpdateDt\", "
                         + "ict.ma_inv_coll_template_id as \"invCollTemplateId\", ma_inv_coll_template_name as \"invCollTemplateName\", store_type_code as \"storeTypeCode\", "
                         + "sum(case when sm.site_id is not null then 1 else 0 end) as \"marketCount\", hsn.hs_network_name  as \"networkName\", hsn.hs_network_id  as \"networkId\",hsn.hs_network_type_id  as \"networkTypeId\", hsnh.network_hub_id  as \"networkHubId\","
-                        + "hsn.is_active AS \"isActive\" "
+                        +" hsn.is_active AS \"isActive\",hspm.hsn_product_map_id as \"product_map_id\", hspm.hsn_product_map_name as  \"product_map_name\" "
                         + "from site s "
                         + "inner join site_type st on s.SITE_TYPE_CODE = st.SITE_TYPE_CODE "
                         + "left join site_market sm on s.site_id = sm.site_id "
                         + "left join major_account ma on s.major_account_id = ma.major_account_id "
                         + "left join ma_inv_coll_template ict on ict.ma_inv_coll_template_id = nvl(s.ma_inv_coll_template_id, ma.default_inv_coll_template_id) "
                         + " left join hs_network_hub hsnh on hsnh.hub_site_id = s.site_id"
                         + " left join hub_spoke_network hsn on hsn.hs_network_id = hsnh.network_id"
-//                        + " left join hs_network_spoke hsns on hsns.spoke_site_id = s.site_id"
+                        + " left join hs_network_product_map  hspm on hspm.network_hub_id = hsnh.network_hub_id and hspm.is_active = 1 "
                         + " WHERE s.ACTIVE_FLAG = 'Y' "+jasStoreOnly;
                 if (userId == 0) {
                     sql += "and s.SITE_ID in (select site_id from SITE_GROUP_MAPPING where SITE_GROUP_ID = ? and (SITE_ID,0) in (" + userAccessSites + ") ) ";
@@ -355,7 +355,7 @@
                         "hsn.is_active,"+
                         "hsn.hs_network_name,"+
                         "hsn.hs_network_type_id,"+
-                        "hsnh.network_hub_id,hsn.hs_network_type_id, store_type_code ";
+                        "hsnh.network_hub_id,  hsn.hs_network_type_id, hspm.hsn_product_map_id, hspm.hsn_product_map_name, store_type_code ";
 
                 sql += "order by s.SITE_NAME";