From 10ee47b2668374436f4ce0ab1665818a573e3f87 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@Admin>
Date: 星期二, 20 十一月 2018 13:15:13 +0800
Subject: [PATCH] Merge branch 'master' into dev1
---
fanli/src/main/java/com/yeshi/fanli/service/impl/activity/ActivityServiceImpl.java | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/activity/ActivityServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/activity/ActivityServiceImpl.java
index b74238c..0ca59b3 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/activity/ActivityServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/activity/ActivityServiceImpl.java
@@ -120,7 +120,10 @@
if (activity.getType() != RecommendActivity.TYPE_SHARE_GOODS)
throw new ActivityException(3, "涓嶅睘浜庡垎浜晢鍝佸姩鎬�");
ActivityShareResult result = new ActivityShareResult();
- result.setTitle(activity.getTitle().replace("<br>", "/n").replace("<p>", "").replace("</p>", ""));
+ String title = activity.getTitle().replace("<br>", "/n").replace("<p>", "").replace("</p>", "");
+ if (title != null && title.trim().endsWith("/n"))
+ title = title.trim().substring(0, title.trim().length() - 2);
+ result.setTitle(title);
List<FileUploadResult> imgList = new ArrayList<>();
if (activity.getGoodsList() != null) {
// 鎻愬墠鍒嗛厤濂絇ID
--
Gitblit v1.8.0