From 1215065e40d634a443cc13e54eefd2b10dcb3061 Mon Sep 17 00:00:00 2001 From: admin <weikou2014> Date: 星期二, 03 十二月 2019 12:30:50 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div --- fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ShareController.java | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ShareController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ShareController.java index c935eb5..f5cdc0e 100644 --- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ShareController.java +++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ShareController.java @@ -1099,7 +1099,10 @@ continue; } } - commentTexts.add(arr.optString(i).replace("[涓嬭浇閾炬帴]", Constant.YINGYONGBAO_LINK).replace("[閭�璇风爜]", inviteCode).replace("[娣樺彛浠", data.optString("token"))); + if(StringUtil.isNullOrEmpty(inviteCode)) + commentTexts.add(arr.optString(i).replace("[涓嬭浇閾炬帴]", Constant.YINGYONGBAO_LINK).replace("[娣樺彛浠", data.optString("token"))); + else + commentTexts.add(arr.optString(i).replace("[涓嬭浇閾炬帴]", Constant.YINGYONGBAO_LINK).replace("[閭�璇风爜]", inviteCode).replace("[娣樺彛浠", data.optString("token"))); } } data.put("commentTexts", commentTexts); @@ -1128,7 +1131,7 @@ } } title = title.replace("銆愰個璇风爜銆�", inviteCode); - title = title.replace("銆愰個璇烽摼鎺ャ��", UserUtil.getInviteShortLink(uid)); + title = title.replace("銆愰個璇烽摼鎺ャ��", Constant.YINGYONGBAO_LINK); data.put("title", title); } else { // 鏈夊浘鍒嗕韩 -- Gitblit v1.8.0