From e53f386fd0e55bc27925898b67a24658846be49b Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期五, 06 三月 2026 10:56:24 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dingyuannongji

---
 server/dmmall_service/src/main/java/com/doumee/service/business/impl/UserActionServiceImpl.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/server/dmmall_service/src/main/java/com/doumee/service/business/impl/UserActionServiceImpl.java b/server/dmmall_service/src/main/java/com/doumee/service/business/impl/UserActionServiceImpl.java
index 58dfdfc..291d943 100644
--- a/server/dmmall_service/src/main/java/com/doumee/service/business/impl/UserActionServiceImpl.java
+++ b/server/dmmall_service/src/main/java/com/doumee/service/business/impl/UserActionServiceImpl.java
@@ -85,9 +85,9 @@
                                          String before,
                                          String after) {
         String info = type.getInfo();
-        if(params!=null){
+        if(params!=null&&info!= null){
             for (int i = 0; i < params.length; i++) {
-                info = info.replace("${param"+(i+1)+"}",params[i]);
+                info = info.replace("${param"+(i+1)+"}",StringUtils.defaultString(params[i],""));
             }
         }
         UserAction userAction=new UserAction();

--
Gitblit v1.9.3