Merge branch 'master' of http://key@gitlab.egolm.com/key/shop.git

src/main/java/com/egolm/shop/service/impl/BrandServiceImpl.java

@@ -2,6 +2,7 @@ package com.egolm.shop.service.impl;
 
 import java.util.ArrayList;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -116,7 +117,20 @@ public class BrandServiceImpl implements BrandService {
 			 sql += " and a.sIPBrandTypeID = '"+comId+"' ";
 		 }
 		 
-		return jdbcTemplate.limit(sql, page, orgNO);
+		 List<Map<String, Object>> list =  jdbcTemplate.limit(sql, page, orgNO);
+		 if(list != null && list.size() >0) {
+			 for(Map<String,Object> map:list) {
+				  String IPID = map.get("IPID")+"";
+				  Map<String,Object>  detailQueryMap = new HashMap<String,Object>();
+				  detailQueryMap.put("orgNO", orgNO);
+				  detailQueryMap.put("ipId", IPID);
+				  Map<String, Object> detailMap = hotIPDetail(detailQueryMap);
+				  map.put("detail", detailMap);
+			 }
+		 }
+		 
+		 
+		 return list;
 	}
 	
 	/**