Skip to content

B
brandkbs2
Commit 00cdb86d by shenjunjie
Options

Merge branch 'release' into 'master' 

Release

See merge request !541
parents 578a5334 eb1c4d06
Showing with 3 additions and 4 deletions
src/main/java/com/zhiwei/brandkbs2/service/impl/ProjectWarnServiceImpl.java
...@@ -238,10 +238,9 @@ public class ProjectWarnServiceImpl implements ProjectWarnService { ...@@ -238,10 +238,9 @@ public class ProjectWarnServiceImpl implements ProjectWarnService {
} else { } else {
politicsLevels.forEach(politicsLevel -> mediaChannel.append(politicsLevel).append("、")); politicsLevels.forEach(politicsLevel -> mediaChannel.append(politicsLevel).append("、"));
} }
if (Tools.isEmpty(fields)) { if (Tools.isEmpty(fields) || fields.contains("全部")) {
if (0 != key2Header.length() || fields.contains("全部")) { if (0 != key2Header.length()) {
key2Header += "、"; key2Header += "、【全部领域】,";
key2Header += "【全部领域】,";
} else { } else {
key2Header += "【全部领域】"; key2Header += "【全部领域】";
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment