Merge branch 'feature' into 'release'

舆情动态推送词调整2

See merge request !540

src/main/java/com/zhiwei/brandkbs2/service/impl/ProjectWarnServiceImpl.java

@@ -238,10 +238,9 @@ public class ProjectWarnServiceImpl implements ProjectWarnService {
         } else {
             politicsLevels.forEach(politicsLevel -> mediaChannel.append(politicsLevel).append("、"));
         }
-        if (Tools.isEmpty(fields)) {
-            if (0 != key2Header.length() || fields.contains("全部")) {
-                key2Header += "、";
-                key2Header += "【全部领域】,";
+        if (Tools.isEmpty(fields) || fields.contains("全部")) {
+            if (0 != key2Header.length()) {
+                key2Header += "、【全部领域】,";
             } else {
                 key2Header += "【全部领域】";
             }