huangzhiguo 2 gadi atpakaļ
vecāks
revīzija
cc30766099

+ 6 - 1
src/main/java/com/caimei/www/service/page/impl/ArticleServiceImpl.java

@@ -187,7 +187,12 @@ public class ArticleServiceImpl implements ArticleService {
         List<Article> relateds = articleDao.getArticleRelatedLimit(id, strings);
         relateds.forEach(item -> {
             item.setImage(ImageUtil.getImageURL("", item.getImage(), 0, domain));
-            item.setRelatedLabels(item.getRelatedLabels().replaceAll("##",","));
+            if (!StringUtils.isEmpty(item.getRelatedLabels())) {
+                item.setRelatedLabels(item.getRelatedLabels().replaceAll("##",","));
+            } else {
+                item.setRelatedLabels("");
+            }
+
         });
         return relateds;
     }

+ 5 - 1
src/main/java/com/caimei/www/service/page/impl/ProductServiceImpl.java

@@ -471,7 +471,11 @@ public class ProductServiceImpl implements ProductService {
             };
         }
         entryInfo.setReferenceList(referenceList);
-        entryInfo.setRelatedLabels(entryInfo.getRelatedLabels().replaceAll("##",","));
+        if (!StringUtils.isNullOrEmpty(entryInfo.getRelatedLabels())) {
+            entryInfo.setRelatedLabels(entryInfo.getRelatedLabels().replaceAll("##",","));
+        } else {
+            entryInfo.setRelatedLabels("");
+        }
         return entryInfo;
     }
 }