From aaf32ea778ce17f13de970f1a1dc558bbbc5b9b0 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 19 五月 2023 10:51:46 +0800
Subject: [PATCH] 指令

---
 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