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

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

@@ -124,7 +124,7 @@ public class ArticleServiceImpl implements ArticleService {
     @Override
     public List<CmProductArchiveFile> findArchiveFileAddTime(String relatedLabelIds,Integer pageNum,  Integer pageSize) {
         String[] archiveProductID=null!=relatedLabelIds?articleDao.findArchiveProductID(relatedLabelIds):null;
-        List<CmProductArchiveFile> selected = articleDao.findArchiveFileAddTime(archiveProductID.length>0?archiveProductID:null,pageNum,pageSize);
+        List<CmProductArchiveFile> selected = articleDao.findArchiveFileAddTime(archiveProductID,pageNum,pageSize);
         return selected;
     }
 

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

@@ -105,7 +105,7 @@ public class ProductServiceImpl implements ProductService {
     @Override
     public List<ProductList> getProductSellNumbers(String relatedLabelIds) {
         String[] archiveProductID= null!=relatedLabelIds?articleDao.findArchiveProductID(relatedLabelIds):null;
-        List<ProductList> productSellNumbers = productDao.getProductSellNumbers(archiveProductID.length>0?archiveProductID:null);
+        List<ProductList> productSellNumbers = productDao.getProductSellNumbers(archiveProductID);
         if (null != productSellNumbers && productSellNumbers.size() > 0) {
             productSellNumbers.forEach(product -> {
                 // 设置 图片路径

src/main/resources/mapper/ArticleMapper.xml

@@ -100,7 +100,7 @@
 		left join cm_product_archive_content cc on cf.archiveContentId = cc.id
 		left join cm_product_archive  pa on cc.productArchiveId = pa.id
 		where cc.type = 3
-		<if test="productIds != null and productIds != ''">
+		<if test="productIds != null and productIds.length>0">
 			and pa.productId in
 			<foreach item="productID" collection="productIds" open="(" separator="," close=")">
 				#{productID}

src/main/resources/mapper/ProductMapper.xml

@@ -115,7 +115,7 @@
 		left join cm_organize_product_info copi on copi.productId = p.productId
 		where copi.validFlag  = 2
 		  and copi.organizeId = 0
-		<if test="productIds != null and productIds != ''">
+		<if test="productIds != null and productIds.length>0">
 			and p.productId in
 			<foreach item="productID" collection="productIds" open="(" separator="," close=")">
 				#{productID}