From cc6ab7021c3aef6ca3bbf05f8bcb5bfe0e6f6096 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 18 三月 2025 16:52:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
server/services/src/main/java/com/doumee/core/dingding/DingDingNotice.java | 12 ++----------
1 files changed, 2 insertions(+), 10 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/core/dingding/DingDingNotice.java b/server/services/src/main/java/com/doumee/core/dingding/DingDingNotice.java
index 59cf41b..190910f 100644
--- a/server/services/src/main/java/com/doumee/core/dingding/DingDingNotice.java
+++ b/server/services/src/main/java/com/doumee/core/dingding/DingDingNotice.java
@@ -99,16 +99,8 @@
return;
}
desc= desc.replace("{杞﹁締缂栧彿}",bikeCode);
- if(StringUtils.isNotBlank(place)){
- desc= desc.replace("{瀹氫綅浣嶇疆}",place);
- }else{
- desc=desc.replace("{瀹氫綅浣嶇疆}","鏈煡");
- }
- if(StringUtils.isNotBlank(siteName)){
- desc= desc.replace("{绔欑偣鍚嶇О}",siteName);
- }else{
- desc=desc.replace("{绔欑偣鍚嶇О}","鏈煡");
- }
+ desc= desc.replace("{瀹氫綅浣嶇疆}",StringUtils.defaultString(place,"鏈煡"));
+ desc= desc.replace("{绔欑偣鍚嶇О}",StringUtils.defaultString(siteName,"鏈煡"));
sendNoticeNew(desc,token,robotCode,chatToken);
}
--
Gitblit v1.9.3