From 0d61b9bfca526e9c3da2209de8f9f367e76fd013 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期四, 18 九月 2025 18:09:35 +0800
Subject: [PATCH] 修改constant类名

---
 blade-service/blade-mdm/src/main/java/org/springblade/mdm/statreport/utils/WordReplaceUtil.java |   28 ++++++++++++++++++----------
 1 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/statreport/utils/WordReplaceUtil.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/statreport/utils/WordReplaceUtil.java
index 3711446..ef7ba66 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/statreport/utils/WordReplaceUtil.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/statreport/utils/WordReplaceUtil.java
@@ -50,6 +50,9 @@
 					for (Map.Entry<String, String> entry : data.entrySet()) {
 						String placeholder = entry.getKey();
 						String replacement = entry.getValue();
+						if(replacement==null) {
+							replacement = "";
+						}
 						if (text.contains(placeholder)) {
 							text = text.replace(placeholder, replacement);
 							run.setText(text, 0);
@@ -68,12 +71,14 @@
 				for (Map.Entry<String, String> entry : data.entrySet()) {
 					String placeholder = entry.getKey();
 					String replacement = entry.getValue();
-					if(replacement!=null) {
-						if (text.contains(placeholder)) {
-							text = text.replace(placeholder, replacement);
-							run.setText(text, 0);
-						}
+					if(replacement==null) {
+						replacement = "";
 					}
+					if (text.contains(placeholder)) {
+						text = text.replace(placeholder, replacement);
+						run.setText(text, 0);
+					}
+
 				}
 			}
 		}
@@ -96,12 +101,15 @@
 								for (Map.Entry<String, String> entry : data.entrySet()) {
 									String placeholder = entry.getKey();
 									String replacement = entry.getValue();
-									if(replacement!=null) {
-										if (text.contains(placeholder)) {
-											text = text.replace(placeholder, replacement);
-											run.setText(text, 0);
-										}
+									if(replacement==null) {
+										replacement = "";
 									}
+
+									if (text.contains(placeholder)) {
+										text = text.replace(placeholder, replacement);
+										run.setText(text, 0);
+									}
+
 								}
 							}
 						}

--
Gitblit v1.9.3