舆情动态推送词调整

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

@@ -233,27 +233,18 @@ public class ProjectWarnServiceImpl implements ProjectWarnService {
         StringBuilder mediaChannel = new StringBuilder();
         List<String> politicsLevels = config.getPoliticsLevels();
         List<String> fields = config.getFields();
-        if(Tools.isEmpty(politicsLevels)){
+        if (Tools.isEmpty(politicsLevels) || politicsLevels.contains("全部")) {
             key2Header += "【全部级别】";
-        }else if(politicsLevels.contains("全部")){
-            key2Header += "【重点级别】";
-        }else{
+        } else {
             politicsLevels.forEach(politicsLevel -> mediaChannel.append(politicsLevel).append("、"));
         }
         if (Tools.isEmpty(fields)) {
-            if (0 != key2Header.length()) {
+            if (0 != key2Header.length() || fields.contains("全部")) {
                 key2Header += "、";
                 key2Header += "【全部领域】,";
             } else {
                 key2Header += "【全部领域】";
             }
-        } else if (fields.contains("全部")) {
-            if (0 != key2Header.length()) {
-                key2Header += "、";
-                key2Header += "【重点领域】,";
-            } else {
-                key2Header += "【重点领域】";
-            }
         } else {
             fields.forEach(field -> mediaChannel.append(field).append("、"));
         }