bugfix

src/main/java/com/caimei365/commodity/mapper/PageMapper.java

@@ -7,6 +7,7 @@ import com.caimei365.commodity.model.search.ProductListVo;
 import com.caimei365.commodity.model.vo.*;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
+import org.springframework.web.bind.annotation.PostMapping;
 
 import java.util.Date;
 import java.util.List;
@@ -345,8 +346,9 @@ public interface PageMapper {
      *
      * @param typeId
      * @param keyword
+     * @param limitNum
      */
-    List<BaikeProductVo> getBaikeProducts(@Param("typeId") Integer typeId, @Param("keyword") String keyword);
+    List<BaikeProductVo> getBaikeProducts(@Param("typeId") Integer typeId, @Param("keyword") String keyword, @Param("limitNum") Integer limitNum);
     /**
      * 根据商品id查询问题列表
      */

src/main/java/com/caimei365/commodity/service/impl/PageServiceImpl.java

@@ -1222,7 +1222,7 @@ public class PageServiceImpl implements PageService {
         List<BaikeTypeVo> baikeTypeList = pageMapper.getBaikeTypeList(commodityType);
         baikeTypeList.forEach(baikeType->{
             // 产品/仪器列表
-            List<BaikeProductVo> productList = pageMapper.getBaikeProducts(baikeType.getTypeId(), null);
+            List<BaikeProductVo> productList = pageMapper.getBaikeProducts(baikeType.getTypeId(), null, 6);
             productList.forEach(product ->{
                 // 问题列表
                 List<String> questionList = pageMapper.getBaikeQuestionList(product.getProductId());
@@ -1237,7 +1237,7 @@ public class PageServiceImpl implements PageService {
     public ResponseJson<PaginationVo<BaikeProductVo>> getBaikeTypeData(Integer typeId, int pageNum, int pageSize) {
         // 产品/仪器列表
         PageHelper.startPage(pageNum, pageSize);
-        List<BaikeProductVo> productList = pageMapper.getBaikeProducts(typeId, null);
+        List<BaikeProductVo> productList = pageMapper.getBaikeProducts(typeId, null, null);
         productList.forEach(product -> {
             // 问题列表
             List<String> questionList = pageMapper.getBaikeQuestionList(product.getProductId());

src/main/java/com/caimei365/commodity/service/impl/SearchQueryServiceImpl.java

@@ -760,7 +760,7 @@ public class SearchQueryServiceImpl implements SearchQueryService {
             return ResponseJson.error("参数异常",null);
         }
         PageHelper.startPage(pageNum, pageSize);
-        List<BaikeProductVo> baikeProducts = pageMapper.getBaikeProducts(null, keyword);
+        List<BaikeProductVo> baikeProducts = pageMapper.getBaikeProducts(null, keyword, null);
         baikeProducts.forEach(product -> {
             // 问题列表
             List<String> questionList = pageMapper.getBaikeQuestionList(product.getProductId());

src/main/resources/mapper/PageMapper.xml

@@ -721,6 +721,9 @@
                 and name like concat ('%',#{keyword},'%')
             </if>
         </where>
+        <if test="limitNum != null">
+            limit #{limitNum}
+        </if>
     </select>
     <select id="getBaikeQuestionList" resultType="java.lang.String">
         select question from cm_baike_product_question where productId = #{productId}