From cf9fac40a8e39b25ee935a743224ae6c405bbddc Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期一, 24 三月 2025 19:33:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jxjdzwcs' into jxjdzwcs
---
src/main/java/com/zy/common/utils/YamlUtils.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/common/utils/YamlUtils.java b/src/main/java/com/zy/common/utils/YamlUtils.java
index 25d8046..9e2a425 100644
--- a/src/main/java/com/zy/common/utils/YamlUtils.java
+++ b/src/main/java/com/zy/common/utils/YamlUtils.java
@@ -112,7 +112,8 @@
String[] split = trim.split(":");
String lineName = split[0];
if (lineName.equals(name)) {
- lines[idx] = line + " #" + dataResource.getMemo();
+ String[] split1 = line.split("#");
+ lines[idx] = split1[0] + " #" + dataResource.getMemo();
}
idx++;
}
@@ -173,6 +174,9 @@
}
} else {
String data = dataResource.getData();
+ if (data == null) {
+ data = "";
+ }
map.put(dataResource.getName(), data);
}
}
--
Gitblit v1.9.1