Browse Source

Merge branch 'test' of http://112.74.196.215:3000/backend/mo-daq-all into release

wangzaijun 1 month ago
parent
commit
77cda3c6cd

+ 5 - 3
mo-daq/src/main/java/com/smppw/modaq/application/components/ReportParseUtils.java

@@ -183,9 +183,11 @@ public final class ReportParseUtils {
         if (!StrUtil.isNullOrUndefined(fieldValue)) {
             // 特殊字符替换,空格替换为空字符
             fieldValue = fieldValue
-                    .replace("\r", StrUtil.EMPTY)
-                    .replace(";", ";")
-                    .replaceAll(" ", StrUtil.EMPTY);
+                    .replaceAll("\r", StrUtil.EMPTY)
+                    .replaceAll(";", ";")
+                    .replaceAll(":", ":")
+                    .replaceAll(" ", StrUtil.EMPTY)
+                    .replaceAll(":", StrUtil.EMPTY);
             if (replaceParentheses) {
                 // 正则表达式匹配中文括号及其内容,并替换为空字符串
                 fieldValue = Pattern.compile("[(|(][^)]*[)|)]").matcher(fieldValue).replaceAll(StrUtil.EMPTY);