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

admin

2020-01-03 1e4e20573dfc917e7b43068da35ee532a192aacd

 fanli/src/main/java/com/yeshi/fanli/controller/client/v2/DynamicControllerV2.java

@@ -371,9 +371,14 @@
      if (list != null) {

         for (ArticleVO article: list) {

            String tags = article.getTags();

            if (!StringUtil.isNullOrEmpty(tags)) {

            if (StringUtil.isNullOrEmpty(tags)) {

               continue;

            }

				
               String[] arrayTags = tags.split("\\s+");

               List<ClientTextStyleVO> labels = new ArrayList<ClientTextStyleVO>();

            if (arrayTags == null || arrayTags.length == 0) {

               continue;

            }

               

               String[] arrayTagsColour = null;

               String tagsColour = article.getTagsColour();

@@ -382,9 +387,10 @@
               }

               

               String color = "#FE0014";

            List<ClientTextStyleVO> labels = new ArrayList<ClientTextStyleVO>();

               for (int i =0; i < arrayTags.length;i ++) {

                  String tag = arrayTags[i];

                  if (arrayTagsColour.length == arrayTags.length) {

               if (arrayTagsColour != null && arrayTagsColour.length == arrayTags.length) {

                     color = arrayTagsColour[i];

                  }

                  ClientTextStyleVO styleVO = new ClientTextStyleVO();

@@ -393,7 +399,6 @@
                  labels.add(styleVO);

               }

               article.setLabels(labels);

            }

         }

      }