From 1e4e20573dfc917e7b43068da35ee532a192aacd Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 03 一月 2020 15:09:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/DynamicControllerV2.java | 49 +++++++++++++++++++++++++++----------------------
1 files changed, 27 insertions(+), 22 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/DynamicControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/DynamicControllerV2.java
index 1d6afa3..d557dad 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/DynamicControllerV2.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/DynamicControllerV2.java
@@ -371,29 +371,34 @@
if (list != null) {
for (ArticleVO article: list) {
String tags = article.getTags();
- if (!StringUtil.isNullOrEmpty(tags)) {
- String[] arrayTags = tags.split("\\s+");
- List<ClientTextStyleVO> labels = new ArrayList<ClientTextStyleVO>();
-
- String[] arrayTagsColour = null;
- String tagsColour = article.getTagsColour();
- if (!StringUtil.isNullOrEmpty(tagsColour)) {
- arrayTagsColour = tagsColour.split("\\s+");
- }
-
- String color = "#FE0014";
- for (int i =0; i < arrayTags.length;i ++) {
- String tag = arrayTags[i];
- if (arrayTagsColour.length == arrayTags.length) {
- color = arrayTagsColour[i];
- }
- ClientTextStyleVO styleVO = new ClientTextStyleVO();
- styleVO.setColor(color);
- styleVO.setContent(tag);
- labels.add(styleVO);
- }
- article.setLabels(labels);
+ if (StringUtil.isNullOrEmpty(tags)) {
+ continue;
}
+
+ String[] arrayTags = tags.split("\\s+");
+ if (arrayTags == null || arrayTags.length == 0) {
+ continue;
+ }
+
+ String[] arrayTagsColour = null;
+ String tagsColour = article.getTagsColour();
+ if (!StringUtil.isNullOrEmpty(tagsColour)) {
+ arrayTagsColour = tagsColour.split("\\s+");
+ }
+
+ String color = "#FE0014";
+ List<ClientTextStyleVO> labels = new ArrayList<ClientTextStyleVO>();
+ for (int i = 0; i < arrayTags.length;i ++) {
+ String tag = arrayTags[i];
+ if (arrayTagsColour != null && arrayTagsColour.length == arrayTags.length) {
+ color = arrayTagsColour[i];
+ }
+ ClientTextStyleVO styleVO = new ClientTextStyleVO();
+ styleVO.setColor(color);
+ styleVO.setContent(tag);
+ labels.add(styleVO);
+ }
+ article.setLabels(labels);
}
}
--
Gitblit v1.8.0