Merge remote-tracking branch 'origin/developerA' into developerA

src/main/java/com/caimei/www/pojo/baike/BaikeProduct.java

@@ -136,7 +136,7 @@ public class BaikeProduct implements Serializable {
     /**
      * 参数列表
      */
-    private List<BaikeProductParam> paramList;
+    private List<List<BaikeProductParam>> paramList;
     /**
      * 产品认证图片列表
      */

src/main/java/com/caimei/www/service/page/impl/ProductServiceImpl.java

@@ -21,6 +21,7 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -218,7 +219,20 @@ public class ProductServiceImpl implements ProductService {
         BaikeProduct baikeProduct = baikeDao.getBaikeProductDetail(productId);
         if (null != baikeProduct) {
             // 参数列表
-            List<BaikeProductParam> paramList = baikeDao.findParamList(productId);
+            List<BaikeProductParam> paramResult = baikeDao.findParamList(productId);
+            List<List<BaikeProductParam>> paramList = new ArrayList<>();
+            ArrayList<BaikeProductParam> paramElement = new ArrayList<>();
+            for (BaikeProductParam param : paramResult) {
+                int size = paramElement.size();
+                paramElement.add(param);
+                if (size == 1) {
+                    paramList.add(paramElement);
+                    paramElement = new ArrayList<>();
+                }
+            }
+            if (paramElement.size() != 0) {
+                paramList.add(paramElement);
+            }
             baikeProduct.setParamList(paramList);
             // 产品/仪器认证图片列表
             List<String> authImageList = baikeDao.findImageList(productId, 1);